Skip to content

Commit f471c94

Browse files
authored
Update samples to XR_MSFT_scene_understanding_preview3 extension (#81)
and added "tracking state" sample scene.
1 parent 023f09f commit f471c94

21 files changed

Lines changed: 4119 additions & 1042 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/master/openxr_preview) folder contains a set of [preview header files](https://github.com/microsoft/OpenXR-MixedReality/tree/master/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_scene_understanding_preview2](https://microsoft.github.io/OpenXR-MixedReality/openxr_preview/specs/openxr.html#XR_MSFT_scene_understanding_preview2)
31+
1. [XR_MSFT_scene_understanding_preview3](https://microsoft.github.io/OpenXR-MixedReality/openxr_preview/specs/openxr.html#XR_MSFT_scene_understanding_preview3)
3232

3333
1. [XR_MSFT_scene_understanding_serialization_preview](https://microsoft.github.io/OpenXR-MixedReality/openxr_preview/specs/openxr.html#XR_MSFT_scene_understanding_serialization_preview)
3434

openxr_preview/include/openxr/openxr.h

Lines changed: 275 additions & 69 deletions
Large diffs are not rendered by default.

openxr_preview/include/openxr/openxr_platform.h

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define OPENXR_PLATFORM_H_ 1
33

44
/*
5-
** Copyright (c) 2017-2020 The Khronos Group Inc.
5+
** Copyright (c) 2017-2021, The Khronos Group Inc.
66
**
77
** SPDX-License-Identifier: Apache-2.0 OR MIT
88
*/
@@ -63,6 +63,7 @@ XRAPI_ATTR XrResult XRAPI_CALL xrCreateSwapchainAndroidSurfaceKHR(
6363
#define XR_KHR_android_create_instance 1
6464
#define XR_KHR_android_create_instance_SPEC_VERSION 3
6565
#define XR_KHR_ANDROID_CREATE_INSTANCE_EXTENSION_NAME "XR_KHR_android_create_instance"
66+
// XrInstanceCreateInfoAndroidKHR extends XrInstanceCreateInfo
6667
typedef struct XrInstanceCreateInfoAndroidKHR {
6768
XrStructureType type;
6869
const void* XR_MAY_ALIAS next;
@@ -92,6 +93,7 @@ typedef struct XrVulkanSwapchainFormatListCreateInfoKHR {
9293
#define XR_KHR_opengl_enable_SPEC_VERSION 9
9394
#define XR_KHR_OPENGL_ENABLE_EXTENSION_NAME "XR_KHR_opengl_enable"
9495
#ifdef XR_USE_PLATFORM_WIN32
96+
// XrGraphicsBindingOpenGLWin32KHR extends XrSessionCreateInfo
9597
typedef struct XrGraphicsBindingOpenGLWin32KHR {
9698
XrStructureType type;
9799
const void* XR_MAY_ALIAS next;
@@ -101,6 +103,7 @@ typedef struct XrGraphicsBindingOpenGLWin32KHR {
101103
#endif // XR_USE_PLATFORM_WIN32
102104

103105
#ifdef XR_USE_PLATFORM_XLIB
106+
// XrGraphicsBindingOpenGLXlibKHR extends XrSessionCreateInfo
104107
typedef struct XrGraphicsBindingOpenGLXlibKHR {
105108
XrStructureType type;
106109
const void* XR_MAY_ALIAS next;
@@ -113,6 +116,7 @@ typedef struct XrGraphicsBindingOpenGLXlibKHR {
113116
#endif // XR_USE_PLATFORM_XLIB
114117

115118
#ifdef XR_USE_PLATFORM_XCB
119+
// XrGraphicsBindingOpenGLXcbKHR extends XrSessionCreateInfo
116120
typedef struct XrGraphicsBindingOpenGLXcbKHR {
117121
XrStructureType type;
118122
const void* XR_MAY_ALIAS next;
@@ -126,6 +130,7 @@ typedef struct XrGraphicsBindingOpenGLXcbKHR {
126130
#endif // XR_USE_PLATFORM_XCB
127131

128132
#ifdef XR_USE_PLATFORM_WAYLAND
133+
// XrGraphicsBindingOpenGLWaylandKHR extends XrSessionCreateInfo
129134
typedef struct XrGraphicsBindingOpenGLWaylandKHR {
130135
XrStructureType type;
131136
const void* XR_MAY_ALIAS next;
@@ -162,6 +167,7 @@ XRAPI_ATTR XrResult XRAPI_CALL xrGetOpenGLGraphicsRequirementsKHR(
162167
#define XR_KHR_opengl_es_enable_SPEC_VERSION 7
163168
#define XR_KHR_OPENGL_ES_ENABLE_EXTENSION_NAME "XR_KHR_opengl_es_enable"
164169
#ifdef XR_USE_PLATFORM_ANDROID
170+
// XrGraphicsBindingOpenGLESAndroidKHR extends XrSessionCreateInfo
165171
typedef struct XrGraphicsBindingOpenGLESAndroidKHR {
166172
XrStructureType type;
167173
const void* XR_MAY_ALIAS next;
@@ -199,6 +205,7 @@ XRAPI_ATTR XrResult XRAPI_CALL xrGetOpenGLESGraphicsRequirementsKHR(
199205
#define XR_KHR_vulkan_enable 1
200206
#define XR_KHR_vulkan_enable_SPEC_VERSION 7
201207
#define XR_KHR_VULKAN_ENABLE_EXTENSION_NAME "XR_KHR_vulkan_enable"
208+
// XrGraphicsBindingVulkanKHR extends XrSessionCreateInfo
202209
typedef struct XrGraphicsBindingVulkanKHR {
203210
XrStructureType type;
204211
const void* XR_MAY_ALIAS next;
@@ -260,6 +267,7 @@ XRAPI_ATTR XrResult XRAPI_CALL xrGetVulkanGraphicsRequirementsKHR(
260267
#define XR_KHR_D3D11_enable 1
261268
#define XR_KHR_D3D11_enable_SPEC_VERSION 5
262269
#define XR_KHR_D3D11_ENABLE_EXTENSION_NAME "XR_KHR_D3D11_enable"
270+
// XrGraphicsBindingD3D11KHR extends XrSessionCreateInfo
263271
typedef struct XrGraphicsBindingD3D11KHR {
264272
XrStructureType type;
265273
const void* XR_MAY_ALIAS next;
@@ -294,6 +302,7 @@ XRAPI_ATTR XrResult XRAPI_CALL xrGetD3D11GraphicsRequirementsKHR(
294302
#define XR_KHR_D3D12_enable 1
295303
#define XR_KHR_D3D12_enable_SPEC_VERSION 7
296304
#define XR_KHR_D3D12_ENABLE_EXTENSION_NAME "XR_KHR_D3D12_enable"
305+
// XrGraphicsBindingD3D12KHR extends XrSessionCreateInfo
297306
typedef struct XrGraphicsBindingD3D12KHR {
298307
XrStructureType type;
299308
const void* XR_MAY_ALIAS next;
@@ -462,6 +471,7 @@ XRAPI_ATTR XrResult XRAPI_CALL xrGetVulkanGraphicsRequirements2KHR(
462471
#define XR_MNDX_egl_enable 1
463472
#define XR_MNDX_egl_enable_SPEC_VERSION 1
464473
#define XR_MNDX_EGL_ENABLE_EXTENSION_NAME "XR_MNDX_egl_enable"
474+
// XrGraphicsBindingEGLMNDX extends XrSessionCreateInfo
465475
typedef struct XrGraphicsBindingEGLMNDX {
466476
XrStructureType type;
467477
const void* XR_MAY_ALIAS next;
@@ -500,6 +510,7 @@ XRAPI_ATTR XrResult XRAPI_CALL xrTryGetPerceptionAnchorFromSpatialAnchorMSFT(
500510
#define XR_MSFT_holographic_window_attachment_SPEC_VERSION 1
501511
#define XR_MSFT_HOLOGRAPHIC_WINDOW_ATTACHMENT_EXTENSION_NAME "XR_MSFT_holographic_window_attachment"
502512
#ifdef XR_USE_PLATFORM_WIN32
513+
// XrHolographicWindowAttachmentMSFT extends XrSessionCreateInfo
503514
typedef struct XrHolographicWindowAttachmentMSFT {
504515
XrStructureType type;
505516
const void* XR_MAY_ALIAS next;
@@ -522,6 +533,7 @@ static const XrAndroidSurfaceSwapchainFlagsFB XR_ANDROID_SURFACE_SWAPCHAIN_SYNCH
522533
static const XrAndroidSurfaceSwapchainFlagsFB XR_ANDROID_SURFACE_SWAPCHAIN_USE_TIMESTAMPS_BIT_FB = 0x00000002;
523534

524535
#ifdef XR_USE_PLATFORM_ANDROID
536+
// XrAndroidSurfaceSwapchainCreateInfoFB extends XrSwapchainCreateInfo
525537
typedef struct XrAndroidSurfaceSwapchainCreateInfoFB {
526538
XrStructureType type;
527539
const void* XR_MAY_ALIAS next;

openxr_preview/include/openxr/openxr_platform_defines.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
** Copyright (c) 2017-2020 The Khronos Group Inc.
2+
** Copyright (c) 2017-2021, The Khronos Group Inc.
33
**
44
** SPDX-License-Identifier: Apache-2.0 OR MIT
55
*/

0 commit comments

Comments
 (0)