Update samples/SDK for release 113. (#117)

README.md

@@ -26,9 +26,12 @@ or choose x64 platform when running on a Windows Desktop PC with the HoloLens 2
 
 # OpenXR preview extensions
 
-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).
+The [openxr_preview](https://github.com/microsoft/OpenXR-MixedReality/tree/main/openxr_preview) folder contains an additional
+[openxr_msft_preview.h](https://github.com/microsoft/OpenXR-MixedReality/tree/main/openxr_preview/include/openxr/openxr_msft_preview.h) header to offer
+the following OpenXR extensions that are only available [in preview runtime](http://aka.ms/openxr-preview).
 
-1. There's no additional preview extensions in latest preview runtime.
+1. [XR_EXTX_hand_interaction](https://github.com/microsoft/OpenXR-MixedReality/tree/main/openxr_preview/include/openxr/preview/xr_ext_hand_interaction.h)
+2. [XR_MSFTX_scene_marker](https://github.com/microsoft/OpenXR-MixedReality/tree/main/openxr_preview/include/openxr/preview/xr_msft_scene_marker.h)
 
 Please send feedback on preview extensions and samples at [GitHub issues](https://github.com/microsoft/OpenXR-MixedReality/issues).
 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_msft_preview.h

@@ -0,0 +1,30 @@
+#pragma once
+
+////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) Microsoft Corporation.  All Rights Reserved
+
+#include "preview/xr_ext_hand_interaction.h"
+#include "preview/xr_msft_scene_marker.h"
+
+// clang-format off
+
+// Supports XrStructTraits and ValidateStruct
+#define XR_LIST_STRUCTURE_TYPES_MSFT_PREVIEW(_) \
+    XR_LIST_STRUCTURE_TYPES_EXT_hand_interaction(_) \
+    XR_LIST_STRUCTURE_TYPES_MSFT_scene_marker(_)
+
+// Supports IXrExtensionConfiguration.EnabledExtensions()
+#define XR_LIST_EXTENSIONS_MSFT_PREVIEW(_) \
+    XR_LIST_EXTENSIONS_EXT_hand_interaction(_) \
+    XR_LIST_EXTENSIONS_MSFT_scene_marker(_)
+
+// Supports xrStructureTypeToString and IsKnownStructType
+#define XR_LIST_ENUM_XrStructureType_MSFT_PREVIEW(_) \
+    XR_LIST_ENUM_XrStructureType_EXT_hand_interaction(_) \
+    XR_LIST_ENUM_XrStructureType_MSFT_scene_marker(_)
+
+// Supports XrDispatchTable.h
+#define XR_LIST_FUNCTIONS_MSFT_PREVIEW(_) \
+    XR_LIST_FUNCTIONS_MSFT_scene_marker(_)
+
+// clang-format on

openxr_preview/include/openxr/openxr_platform.h

@@ -2,7 +2,7 @@
 #define OPENXR_PLATFORM_H_ 1
 
 /*
-** Copyright (c) 2017-2022, The Khronos Group Inc.
+** Copyright 2017-2022 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0 OR MIT
 */
@@ -565,6 +565,30 @@ typedef struct XrAndroidSurfaceSwapchainCreateInfoFB {
 
 #endif /* XR_USE_PLATFORM_ANDROID */
 
+#ifdef XR_USE_PLATFORM_ML
+
+#define XR_ML_compat 1
+#define XR_ML_compat_SPEC_VERSION         1
+#define XR_ML_COMPAT_EXTENSION_NAME       "XR_ML_compat"
+typedef struct XrCoordinateSpaceCreateInfoML {
+    XrStructureType             type;
+    const void* XR_MAY_ALIAS    next;
+    MLCoordinateFrameUID        cfuid;
+    XrPosef                     poseInCoordinateSpace;
+} XrCoordinateSpaceCreateInfoML;
+
+typedef XrResult (XRAPI_PTR *PFN_xrCreateSpaceFromCoordinateFrameUIDML)(XrSession session, const XrCoordinateSpaceCreateInfoML *createInfo, XrSpace* space);
+
+#ifndef XR_NO_PROTOTYPES
+#ifdef XR_EXTENSION_PROTOTYPES
+XRAPI_ATTR XrResult XRAPI_CALL xrCreateSpaceFromCoordinateFrameUIDML(
+    XrSession                                   session,
+    const XrCoordinateSpaceCreateInfoML *       createInfo,
+    XrSpace*                                    space);
+#endif /* XR_EXTENSION_PROTOTYPES */
+#endif /* !XR_NO_PROTOTYPES */
+#endif /* XR_USE_PLATFORM_ML */
+
 #ifdef XR_USE_PLATFORM_WIN32
 
 #define XR_OCULUS_audio_device_guid 1

openxr_preview/include/openxr/openxr_platform_defines.h

@@ -65,7 +65,7 @@ typedef unsigned __int64 uint64_t;
 #endif  // !defined( XR_NO_STDINT_H )
 
 // XR_PTR_SIZE (in bytes)
-#if (defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__))
+#if (defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined(_M_IA64) || defined(__aarch64__) || defined(__powerpc64__))
 #define XR_PTR_SIZE 8
 #else
 #define XR_PTR_SIZE 4