[slicer-5.6-v9.2.20230607-1ff325c54-2] [Backport MR-10814] OpenXRRemoting: Support building against Holographic.Remoting.OpenXr >= 2.9.3#54
Merged
jcfr merged 1 commit intoSlicer:slicer-5.6-v9.2.20230607-1ff325c54-2from Jan 11, 2024
Conversation
…hic.Remoting.OpenXr >= 2.9.3 Starting with Microsoft.Holographic.Remoting.OpenXr 2.9.3, the struct `XrRemotingPreferredGraphicsAdapterMSFT` is defined in `openxr_msft_holographic_remoting.h` and it requires the type LUID to be defined. Since LUID is defined in `windows.h` (see `OpenXR-SDK-Source/specification/registry/xr.xml`), we include the corresponding VTK header and fixes the following error reported when building the vtkRenderingOpenXRRemoting module: ``` C:\path\to\\OpenXRRemoting-install\build\native\include\openxr\openxr_msft_holographic_remoting.h(405,14): error C3646: 'adapterLuid': unknown override specifier ``` Merge-request: vtk/vtk!10814
Member
Author
|
Corresponding changes have been fetched in the
For example, here is the output of the |
jcfr
added a commit
to jcfr/SlicerVirtualReality
that referenced
this pull request
Jan 11, 2024
This enhancement enables building the SlicerVirtualReality extension against the latest version (2.9.3) of Microsoft.Holographic.Remoting.OpenXr. This aligns SlicerVirtualReality with the corresponding version of the "Holographic Remoting Player" available on the Microsoft Store. The update relies on VTK changes integrated into the upstream VTK project via vtk/vtk!10814. Additionally, Slicer/VTK fork branches, namely Slicer/VTK#53 for SlicerPreview and Slicer/VTK#54 for SlicerStable, have been synchronized with these changes. For SlicerPreview, changes have been integrated in Slicer through Slicer/Slicer#7534. In the case of SlicerStable, the updated VTK fork has been manually checked out on the relevant build machines to incorporate the necessary adjustments.
jcfr
added a commit
to KitwareMedical/SlicerVirtualReality
that referenced
this pull request
Jan 11, 2024
This enhancement enables building the SlicerVirtualReality extension against the latest version (2.9.3) of Microsoft.Holographic.Remoting.OpenXr. This aligns SlicerVirtualReality with the corresponding version of the "Holographic Remoting Player" available on the Microsoft Store. The update relies on VTK changes integrated into the upstream VTK project via vtk/vtk!10814. Additionally, Slicer/VTK fork branches, namely Slicer/VTK#53 for SlicerPreview and Slicer/VTK#54 for SlicerStable, have been synchronized with these changes. For SlicerPreview, changes have been integrated in Slicer through Slicer/Slicer#7534. In the case of SlicerStable, the updated VTK fork has been manually checked out on the relevant build machines to incorporate the necessary adjustments.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
These changes correspond to the ones integrated in branch
slicer-v9.2.20230607-1ff325c54-2through #53