Skip to content

Commit 6742451

Browse files
yl-msftyl-msft
authored
Update samples to release 109 (#98)
1 parent bc79ee5 commit 6742451

23 files changed

Lines changed: 2554 additions & 1909 deletions

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ or choose x64 platform when running on a Windows Desktop PC with the HoloLens 2
2828

2929
The [openxr_preview](https://github.com/microsoft/OpenXR-MixedReality/tree/main/openxr_preview) folder contains a set of [preview header files](https://github.com/microsoft/OpenXR-MixedReality/tree/main/openxr_preview/include/openxr) containing the following OpenXR extensions that are only available [in preview runtime](http://aka.ms/openxr-preview).
3030

31-
1. [XR_MSFT_spatial_anchor_export_preview](https://microsoft.github.io/OpenXR-MixedReality/openxr_preview/specs/openxr.html#XR_MSFT_SPATIAL_ANCHOR_EXPORT_PREVIEW)
31+
1. There's no additional preview extensions in latest preview runtime.
3232

3333
Please send feedback on preview extensions and samples at [GitHub issues](https://github.com/microsoft/OpenXR-MixedReality/issues).
3434
We are planning to incorporate your feedback and finalize these extensions as vendor extensions (MSFT) or cross-vendor extensions (EXT)

‎openxr_preview/include/openxr/openxr.h‎

Lines changed: 186 additions & 66 deletions
Large diffs are not rendered by default.

‎openxr_preview/include/openxr/openxr_reflection.h‎

Lines changed: 125 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@ XR_ENUM_STR(XrResult);
102102
_(XR_ERROR_COLOR_SPACE_UNSUPPORTED_FB, -1000108000) \
103103
_(XR_ERROR_SPATIAL_ANCHOR_NAME_NOT_FOUND_MSFT, -1000142001) \
104104
_(XR_ERROR_SPATIAL_ANCHOR_NAME_INVALID_MSFT, -1000142002) \
105-
_(XR_SPATIAL_ANCHOR_EXPORT_DATA_UNAVAILABLE_MSFT, 1000062000) \
106-
_(XR_ERROR_SPATIAL_ANCHOR_EXPORT_FAILED_MSFT, -1000062000) \
107-
_(XR_ERROR_SPATIAL_ANCHOR_SUFFICIENCY_QUERY_FAILED_MSFT, -1000062001) \
108105
_(XR_RESULT_MAX_ENUM, 0x7FFFFFFF)
109106

110107
#define XR_LIST_ENUM_XrStructureType(_) \
@@ -200,7 +197,6 @@ XR_ENUM_STR(XrResult);
200197
_(XR_TYPE_COMPOSITION_LAYER_ALPHA_BLEND_FB, 1000041001) \
201198
_(XR_TYPE_VIEW_CONFIGURATION_DEPTH_RANGE_EXT, 1000046000) \
202199
_(XR_TYPE_GRAPHICS_BINDING_EGL_MNDX, 1000048004) \
203-
_(XR_TYPE_SPATIAL_GRAPH_NODE_SPACE_CREATE_INFO_MSFT, 1000049000) \
204200
_(XR_TYPE_SYSTEM_HAND_TRACKING_PROPERTIES_EXT, 1000051000) \
205201
_(XR_TYPE_HAND_TRACKER_CREATE_INFO_EXT, 1000051001) \
206202
_(XR_TYPE_HAND_JOINTS_LOCATE_INFO_EXT, 1000051002) \
@@ -258,6 +254,10 @@ XR_ENUM_STR(XrResult);
258254
_(XR_TYPE_SCENE_DESERIALIZE_INFO_MSFT, 1000098001) \
259255
_(XR_TYPE_EVENT_DATA_DISPLAY_REFRESH_RATE_CHANGED_FB, 1000101000) \
260256
_(XR_TYPE_SYSTEM_COLOR_SPACE_PROPERTIES_FB, 1000108000) \
257+
_(XR_TYPE_HAND_TRACKING_MESH_FB, 1000110001) \
258+
_(XR_TYPE_HAND_TRACKING_SCALE_FB, 1000110003) \
259+
_(XR_TYPE_HAND_TRACKING_AIM_STATE_FB, 1000111001) \
260+
_(XR_TYPE_HAND_TRACKING_CAPSULES_STATE_FB, 1000112000) \
261261
_(XR_TYPE_FOVEATION_PROFILE_CREATE_INFO_FB, 1000114000) \
262262
_(XR_TYPE_SWAPCHAIN_CREATE_INFO_FOVEATION_FB, 1000114001) \
263263
_(XR_TYPE_SWAPCHAIN_STATE_FOVEATION_FB, 1000114002) \
@@ -273,8 +273,12 @@ XR_ENUM_STR(XrResult);
273273
_(XR_TYPE_SWAPCHAIN_STATE_ANDROID_SURFACE_DIMENSIONS_FB, 1000161000) \
274274
_(XR_TYPE_SWAPCHAIN_STATE_SAMPLER_OPENGL_ES_FB, 1000162000) \
275275
_(XR_TYPE_SWAPCHAIN_STATE_SAMPLER_VULKAN_FB, 1000163000) \
276-
_(XR_TYPE_SPATIAL_ANCHOR_EXPORT_PURPOSE_INFO_MSFT, 1000062000) \
277-
_(XR_TYPE_SPATIAL_ANCHOR_EXPORT_SUFFICIENCY_MSFT, 1000062001) \
276+
_(XR_TYPE_COMPOSITION_LAYER_SPACE_WARP_INFO_FB, 1000171000) \
277+
_(XR_TYPE_SYSTEM_SPACE_WARP_PROPERTIES_FB, 1000171001) \
278+
_(XR_TYPE_SPATIAL_GRAPH_NODE_SPACE_CREATE_INFO_MSFT, 1000049000) \
279+
_(XR_TYPE_SPATIAL_GRAPH_STATIC_NODE_BINDING_CREATE_INFO_MSFT, 1000049001) \
280+
_(XR_TYPE_SPATIAL_GRAPH_STATIC_NODE_BINDING_PROPERTIES_GET_INFO_MSFT, 1000049002) \
281+
_(XR_TYPE_SPATIAL_GRAPH_STATIC_NODE_BINDING_PROPERTIES_MSFT, 1000049003) \
278282
_(XR_STRUCTURE_TYPE_MAX_ENUM, 0x7FFFFFFF)
279283

280284
#define XR_LIST_ENUM_XrFormFactor(_) \
@@ -344,7 +348,7 @@ XR_ENUM_STR(XrResult);
344348
_(XR_OBJECT_TYPE_SCENE_MSFT, 1000097001) \
345349
_(XR_OBJECT_TYPE_FOVEATION_PROFILE_FB, 1000114000) \
346350
_(XR_OBJECT_TYPE_SPATIAL_ANCHOR_STORE_CONNECTION_MSFT, 1000142000) \
347-
_(XR_OBJECT_TYPE_SPATIAL_ANCHOR_NEIGHBORHOOD_DATA_STREAM_MSFT, 1000062000) \
351+
_(XR_OBJECT_TYPE_SPATIAL_GRAPH_STATIC_NODE_BINDING_MSFT, 1000049000) \
348352
_(XR_OBJECT_TYPE_MAX_ENUM, 0x7FFFFFFF)
349353

350354
#define XR_LIST_ENUM_XrAndroidThreadTypeKHR(_) \
@@ -441,11 +445,6 @@ XR_ENUM_STR(XrResult);
441445
_(XR_HAND_POSE_TYPE_REFERENCE_OPEN_PALM_MSFT, 1) \
442446
_(XR_HAND_POSE_TYPE_MAX_ENUM_MSFT, 0x7FFFFFFF)
443447

444-
#define XR_LIST_ENUM_XrSpatialAnchorExportPurposeMSFT(_) \
445-
_(XR_SPATIAL_ANCHOR_EXPORT_PURPOSE_RELOCALIZATION_MSFT, 0) \
446-
_(XR_SPATIAL_ANCHOR_EXPORT_PURPOSE_SHARING_MSFT, 1) \
447-
_(XR_SPATIAL_ANCHOR_EXPORT_PURPOSE_MAX_ENUM_MSFT, 0x7FFFFFFF)
448-
449448
#define XR_LIST_ENUM_XrReprojectionModeMSFT(_) \
450449
_(XR_REPROJECTION_MODE_DEPTH_MSFT, 1) \
451450
_(XR_REPROJECTION_MODE_PLANAR_FROM_DEPTH_MSFT, 2) \
@@ -611,12 +610,25 @@ XR_ENUM_STR(XrResult);
611610
_(XR_COMPOSITION_LAYER_SECURE_CONTENT_EXCLUDE_LAYER_BIT_FB, 0x00000001) \
612611
_(XR_COMPOSITION_LAYER_SECURE_CONTENT_REPLACE_LAYER_BIT_FB, 0x00000002) \
613612

613+
#define XR_LIST_BITS_XrHandTrackingAimFlagsFB(_) \
614+
_(XR_HAND_TRACKING_AIM_COMPUTED_BIT_FB, 0x00000001) \
615+
_(XR_HAND_TRACKING_AIM_VALID_BIT_FB, 0x00000002) \
616+
_(XR_HAND_TRACKING_AIM_INDEX_PINCHING_BIT_FB, 0x00000004) \
617+
_(XR_HAND_TRACKING_AIM_MIDDLE_PINCHING_BIT_FB, 0x00000008) \
618+
_(XR_HAND_TRACKING_AIM_RING_PINCHING_BIT_FB, 0x00000010) \
619+
_(XR_HAND_TRACKING_AIM_LITTLE_PINCHING_BIT_FB, 0x00000020) \
620+
_(XR_HAND_TRACKING_AIM_SYSTEM_GESTURE_BIT_FB, 0x00000040) \
621+
_(XR_HAND_TRACKING_AIM_DOMINANT_HAND_BIT_FB, 0x00000080) \
622+
_(XR_HAND_TRACKING_AIM_MENU_PRESSED_BIT_FB, 0x00000100) \
623+
614624
#define XR_LIST_BITS_XrSwapchainCreateFoveationFlagsFB(_) \
615625
_(XR_SWAPCHAIN_CREATE_FOVEATION_SCALED_BIN_BIT_FB, 0x00000001) \
616626
_(XR_SWAPCHAIN_CREATE_FOVEATION_FRAGMENT_DENSITY_MAP_BIT_FB, 0x00000002) \
617627

618628
#define XR_LIST_BITS_XrSwapchainStateFoveationFlagsFB(_)
619629

630+
#define XR_LIST_BITS_XrCompositionLayerSpaceWarpInfoFlagsFB(_)
631+
620632
#define XR_LIST_STRUCT_XrApiLayerProperties(_) \
621633
_(type) \
622634
_(next) \
@@ -1415,6 +1427,23 @@ XR_ENUM_STR(XrResult);
14151427
_(nodeId) \
14161428
_(pose) \
14171429

1430+
#define XR_LIST_STRUCT_XrSpatialGraphStaticNodeBindingCreateInfoMSFT(_) \
1431+
_(type) \
1432+
_(next) \
1433+
_(space) \
1434+
_(poseInSpace) \
1435+
_(time) \
1436+
1437+
#define XR_LIST_STRUCT_XrSpatialGraphStaticNodeBindingPropertiesGetInfoMSFT(_) \
1438+
_(type) \
1439+
_(next) \
1440+
1441+
#define XR_LIST_STRUCT_XrSpatialGraphStaticNodeBindingPropertiesMSFT(_) \
1442+
_(type) \
1443+
_(next) \
1444+
_(nodeId) \
1445+
_(poseInNodeSpace) \
1446+
14181447
#define XR_LIST_STRUCT_XrSystemHandTrackingPropertiesEXT(_) \
14191448
_(type) \
14201449
_(next) \
@@ -1577,18 +1606,6 @@ XR_ENUM_STR(XrResult);
15771606
_(recommendedFov) \
15781607
_(maxMutableFov) \
15791608

1580-
#define XR_LIST_STRUCT_XrSpatialAnchorExportPurposeInfoMSFT(_) \
1581-
_(type) \
1582-
_(next) \
1583-
_(exportPurpose) \
1584-
1585-
#define XR_LIST_STRUCT_XrSpatialAnchorExportSufficiencyMSFT(_) \
1586-
_(type) \
1587-
_(next) \
1588-
_(isMinimallySufficient) \
1589-
_(recommendedSufficiencyLevel) \
1590-
_(sufficiencyLevel) \
1591-
15921609
#define XR_LIST_STRUCT_XrHolographicWindowAttachmentMSFT(_) \
15931610
_(type) \
15941611
_(next) \
@@ -1823,6 +1840,59 @@ XR_ENUM_STR(XrResult);
18231840
_(next) \
18241841
_(colorSpace) \
18251842

1843+
#define XR_LIST_STRUCT_XrVector4sFB(_) \
1844+
_(x) \
1845+
_(y) \
1846+
_(z) \
1847+
_(w) \
1848+
1849+
#define XR_LIST_STRUCT_XrHandTrackingMeshFB(_) \
1850+
_(type) \
1851+
_(next) \
1852+
_(jointCapacityInput) \
1853+
_(jointCountOutput) \
1854+
_(jointBindPoses) \
1855+
_(jointRadii) \
1856+
_(jointParents) \
1857+
_(vertexCapacityInput) \
1858+
_(vertexCountOutput) \
1859+
_(vertexPositions) \
1860+
_(vertexNormals) \
1861+
_(vertexUVs) \
1862+
_(vertexBlendIndices) \
1863+
_(vertexBlendWeights) \
1864+
_(indexCapacityInput) \
1865+
_(indexCountOutput) \
1866+
_(indices) \
1867+
1868+
#define XR_LIST_STRUCT_XrHandTrackingScaleFB(_) \
1869+
_(type) \
1870+
_(next) \
1871+
_(sensorOutput) \
1872+
_(currentOutput) \
1873+
_(overrideHandScale) \
1874+
_(overrideValueInput) \
1875+
1876+
#define XR_LIST_STRUCT_XrHandTrackingAimStateFB(_) \
1877+
_(type) \
1878+
_(next) \
1879+
_(status) \
1880+
_(aimPose) \
1881+
_(pinchStrengthIndex) \
1882+
_(pinchStrengthMiddle) \
1883+
_(pinchStrengthRing) \
1884+
_(pinchStrengthLittle) \
1885+
1886+
#define XR_LIST_STRUCT_XrHandCapsuleFB(_) \
1887+
_(points) \
1888+
_(radius) \
1889+
_(joint) \
1890+
1891+
#define XR_LIST_STRUCT_XrHandTrackingCapsulesStateFB(_) \
1892+
_(type) \
1893+
_(next) \
1894+
_(capsules) \
1895+
18261896
#define XR_LIST_STRUCT_XrFoveationProfileCreateInfoFB(_) \
18271897
_(type) \
18281898
_(next) \
@@ -1923,6 +1993,24 @@ XR_ENUM_STR(XrResult);
19231993
_(maxAnisotropy) \
19241994
_(borderColor) \
19251995

1996+
#define XR_LIST_STRUCT_XrCompositionLayerSpaceWarpInfoFB(_) \
1997+
_(type) \
1998+
_(next) \
1999+
_(layerFlags) \
2000+
_(motionVectorSubImage) \
2001+
_(appSpaceDeltaPose) \
2002+
_(depthSubImage) \
2003+
_(minDepth) \
2004+
_(maxDepth) \
2005+
_(nearZ) \
2006+
_(farZ) \
2007+
2008+
#define XR_LIST_STRUCT_XrSystemSpaceWarpPropertiesFB(_) \
2009+
_(type) \
2010+
_(next) \
2011+
_(recommendedMotionVectorImageRectWidth) \
2012+
_(recommendedMotionVectorImageRectHeight) \
2013+
19262014

19272015

19282016
#define XR_LIST_STRUCTURE_TYPES_CORE(_) \
@@ -1999,6 +2087,9 @@ XR_ENUM_STR(XrResult);
19992087
_(XrCompositionLayerAlphaBlendFB, XR_TYPE_COMPOSITION_LAYER_ALPHA_BLEND_FB) \
20002088
_(XrViewConfigurationDepthRangeEXT, XR_TYPE_VIEW_CONFIGURATION_DEPTH_RANGE_EXT) \
20012089
_(XrSpatialGraphNodeSpaceCreateInfoMSFT, XR_TYPE_SPATIAL_GRAPH_NODE_SPACE_CREATE_INFO_MSFT) \
2090+
_(XrSpatialGraphStaticNodeBindingCreateInfoMSFT, XR_TYPE_SPATIAL_GRAPH_STATIC_NODE_BINDING_CREATE_INFO_MSFT) \
2091+
_(XrSpatialGraphStaticNodeBindingPropertiesGetInfoMSFT, XR_TYPE_SPATIAL_GRAPH_STATIC_NODE_BINDING_PROPERTIES_GET_INFO_MSFT) \
2092+
_(XrSpatialGraphStaticNodeBindingPropertiesMSFT, XR_TYPE_SPATIAL_GRAPH_STATIC_NODE_BINDING_PROPERTIES_MSFT) \
20022093
_(XrSystemHandTrackingPropertiesEXT, XR_TYPE_SYSTEM_HAND_TRACKING_PROPERTIES_EXT) \
20032094
_(XrHandTrackerCreateInfoEXT, XR_TYPE_HAND_TRACKER_CREATE_INFO_EXT) \
20042095
_(XrHandJointsLocateInfoEXT, XR_TYPE_HAND_JOINTS_LOCATE_INFO_EXT) \
@@ -2021,8 +2112,6 @@ XR_ENUM_STR(XrResult);
20212112
_(XrControllerModelNodeStateMSFT, XR_TYPE_CONTROLLER_MODEL_NODE_STATE_MSFT) \
20222113
_(XrControllerModelStateMSFT, XR_TYPE_CONTROLLER_MODEL_STATE_MSFT) \
20232114
_(XrViewConfigurationViewFovEPIC, XR_TYPE_VIEW_CONFIGURATION_VIEW_FOV_EPIC) \
2024-
_(XrSpatialAnchorExportPurposeInfoMSFT, XR_TYPE_SPATIAL_ANCHOR_EXPORT_PURPOSE_INFO_MSFT) \
2025-
_(XrSpatialAnchorExportSufficiencyMSFT, XR_TYPE_SPATIAL_ANCHOR_EXPORT_SUFFICIENCY_MSFT) \
20262115
_(XrCompositionLayerReprojectionInfoMSFT, XR_TYPE_COMPOSITION_LAYER_REPROJECTION_INFO_MSFT) \
20272116
_(XrCompositionLayerReprojectionPlaneOverrideMSFT, XR_TYPE_COMPOSITION_LAYER_REPROJECTION_PLANE_OVERRIDE_MSFT) \
20282117
_(XrCompositionLayerSecureContentFB, XR_TYPE_COMPOSITION_LAYER_SECURE_CONTENT_FB) \
@@ -2051,6 +2140,10 @@ XR_ENUM_STR(XrResult);
20512140
_(XrSceneDeserializeInfoMSFT, XR_TYPE_SCENE_DESERIALIZE_INFO_MSFT) \
20522141
_(XrEventDataDisplayRefreshRateChangedFB, XR_TYPE_EVENT_DATA_DISPLAY_REFRESH_RATE_CHANGED_FB) \
20532142
_(XrSystemColorSpacePropertiesFB, XR_TYPE_SYSTEM_COLOR_SPACE_PROPERTIES_FB) \
2143+
_(XrHandTrackingMeshFB, XR_TYPE_HAND_TRACKING_MESH_FB) \
2144+
_(XrHandTrackingScaleFB, XR_TYPE_HAND_TRACKING_SCALE_FB) \
2145+
_(XrHandTrackingAimStateFB, XR_TYPE_HAND_TRACKING_AIM_STATE_FB) \
2146+
_(XrHandTrackingCapsulesStateFB, XR_TYPE_HAND_TRACKING_CAPSULES_STATE_FB) \
20542147
_(XrFoveationProfileCreateInfoFB, XR_TYPE_FOVEATION_PROFILE_CREATE_INFO_FB) \
20552148
_(XrSwapchainCreateInfoFoveationFB, XR_TYPE_SWAPCHAIN_CREATE_INFO_FOVEATION_FB) \
20562149
_(XrSwapchainStateFoveationFB, XR_TYPE_SWAPCHAIN_STATE_FOVEATION_FB) \
@@ -2061,6 +2154,8 @@ XR_ENUM_STR(XrResult);
20612154
_(XrCompositionLayerDepthTestVARJO, XR_TYPE_COMPOSITION_LAYER_DEPTH_TEST_VARJO) \
20622155
_(XrSpatialAnchorPersistenceInfoMSFT, XR_TYPE_SPATIAL_ANCHOR_PERSISTENCE_INFO_MSFT) \
20632156
_(XrSpatialAnchorFromPersistedAnchorCreateInfoMSFT, XR_TYPE_SPATIAL_ANCHOR_FROM_PERSISTED_ANCHOR_CREATE_INFO_MSFT) \
2157+
_(XrCompositionLayerSpaceWarpInfoFB, XR_TYPE_COMPOSITION_LAYER_SPACE_WARP_INFO_FB) \
2158+
_(XrSystemSpaceWarpPropertiesFB, XR_TYPE_SYSTEM_SPACE_WARP_PROPERTIES_FB) \
20642159

20652160

20662161

@@ -2260,7 +2355,6 @@ XR_ENUM_STR(XrResult);
22602355
_(XR_MSFT_perception_anchor_interop, 57) \
22612356
_(XR_EXT_win32_appcontainer_compatible, 58) \
22622357
_(XR_EPIC_view_configuration_fov, 60) \
2263-
_(XR_MSFT_spatial_anchor_export_preview, 63) \
22642358
_(XR_MSFT_holographic_window_attachment, 64) \
22652359
_(XR_MSFT_composition_layer_reprojection, 67) \
22662360
_(XR_HUAWEI_controller_interaction, 70) \
@@ -2281,6 +2375,9 @@ XR_ENUM_STR(XrResult);
22812375
_(XR_FB_display_refresh_rate, 102) \
22822376
_(XR_HTC_vive_cosmos_controller_interaction, 103) \
22832377
_(XR_FB_color_space, 109) \
2378+
_(XR_FB_hand_tracking_mesh, 111) \
2379+
_(XR_FB_hand_tracking_aim, 112) \
2380+
_(XR_FB_hand_tracking_capsules, 113) \
22842381
_(XR_FB_foveation, 115) \
22852382
_(XR_FB_foveation_configuration, 116) \
22862383
_(XR_KHR_binding_modification, 121) \
@@ -2294,6 +2391,7 @@ XR_ENUM_STR(XrResult);
22942391
_(XR_FB_swapchain_update_state_opengl_es, 163) \
22952392
_(XR_FB_swapchain_update_state_vulkan, 164) \
22962393
_(XR_KHR_swapchain_usage_input_attachment_bit, 166) \
2394+
_(XR_FB_space_warp, 172) \
22972395

22982396

22992397
#endif

0 commit comments

Comments
 (0)