diff --git a/README.md b/README.md index 97de5d0..157179d 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ products: | Holographic Remoting version | :-----------------: | -| 2.9.1 | +| 2.9.3 | The [Holographic Remoting Samples](https://github.com/microsoft/MixedReality-HolographicRemoting-Samples) repository hosts sample applications for [Holographic Remoting](https://docs.microsoft.com/en-us/windows/mixed-reality/holographic-remoting-player). The two remote samples show how to write an application for streaming content to a Microsoft HoloLens 2 or a PC running Windows Mixed Reality. diff --git a/player/sample/Package.appxmanifest b/player/sample/Package.appxmanifest index be663c4..6b4185e 100644 --- a/player/sample/Package.appxmanifest +++ b/player/sample/Package.appxmanifest @@ -1,6 +1,6 @@ - + - + Sample Holographic AppRemoting Player diff --git a/player/sample/SamplePlayer.vcxproj b/player/sample/SamplePlayer.vcxproj index 2da29a9..c7ff814 100644 --- a/player/sample/SamplePlayer.vcxproj +++ b/player/sample/SamplePlayer.vcxproj @@ -378,6 +378,6 @@ - + \ No newline at end of file diff --git a/player/sample/packages.config b/player/sample/packages.config index 7e494fb..1f694fd 100644 --- a/player/sample/packages.config +++ b/player/sample/packages.config @@ -1,5 +1,5 @@ - + - + diff --git a/remote/desktop/Package.appxmanifest b/remote/desktop/Package.appxmanifest index 98ea5e2..e826a28 100644 --- a/remote/desktop/Package.appxmanifest +++ b/remote/desktop/Package.appxmanifest @@ -1,6 +1,6 @@ - + - + SampleRemote diff --git a/remote/desktop/SampleRemote.vcxproj b/remote/desktop/SampleRemote.vcxproj index e899207..a316b52 100644 --- a/remote/desktop/SampleRemote.vcxproj +++ b/remote/desktop/SampleRemote.vcxproj @@ -332,6 +332,6 @@ - + \ No newline at end of file diff --git a/remote/desktop/packages.config b/remote/desktop/packages.config index 7363849..59a1a88 100644 --- a/remote/desktop/packages.config +++ b/remote/desktop/packages.config @@ -1,7 +1,7 @@ - + - + diff --git a/remote/uwp/Package.appxmanifest b/remote/uwp/Package.appxmanifest index 98ea5e2..e826a28 100644 --- a/remote/uwp/Package.appxmanifest +++ b/remote/uwp/Package.appxmanifest @@ -1,6 +1,6 @@ - + - + SampleRemote diff --git a/remote/uwp/SampleRemote.vcxproj b/remote/uwp/SampleRemote.vcxproj index 246b8f1..56c8769 100644 --- a/remote/uwp/SampleRemote.vcxproj +++ b/remote/uwp/SampleRemote.vcxproj @@ -389,6 +389,6 @@ - + \ No newline at end of file diff --git a/remote/uwp/packages.config b/remote/uwp/packages.config index c73759e..1f4cacf 100644 --- a/remote/uwp/packages.config +++ b/remote/uwp/packages.config @@ -1,7 +1,7 @@ - + - + diff --git a/remote_openxr/desktop/OpenXrProgram.cpp b/remote_openxr/desktop/OpenXrProgram.cpp index 0e278e8..c4f44f3 100644 --- a/remote_openxr/desktop/OpenXrProgram.cpp +++ b/remote_openxr/desktop/OpenXrProgram.cpp @@ -534,7 +534,6 @@ namespace { createInfo.subactionPath = m_subactionPaths[side]; CHECK_XRCMD(xrCreateActionSpace(m_session.Get(), &createInfo, m_cubesInHand[side].Space.Put(xrDestroySpace))); } - } std::tuple SelectSwapchainPixelFormats() { diff --git a/remote_openxr/desktop/SampleRemoteOpenXR.vcxproj b/remote_openxr/desktop/SampleRemoteOpenXR.vcxproj index 94474cc..6dd9fd4 100644 --- a/remote_openxr/desktop/SampleRemoteOpenXR.vcxproj +++ b/remote_openxr/desktop/SampleRemoteOpenXR.vcxproj @@ -254,6 +254,6 @@ - + \ No newline at end of file diff --git a/remote_openxr/desktop/XrUtility/XrExtensionDefined.h b/remote_openxr/desktop/XrUtility/XrExtensionDefined.h index 42e6770..94bd6df 100644 --- a/remote_openxr/desktop/XrUtility/XrExtensionDefined.h +++ b/remote_openxr/desktop/XrUtility/XrExtensionDefined.h @@ -89,6 +89,12 @@ #define XR_MSFT_scene_understanding_DEFINED(_, defined, undefined) _(undefined) #endif +#ifdef XR_MSFT_scene_marker +#define XR_MSFT_scene_marker_DEFINED(_, defined, undefined) _(defined) +#else +#define XR_MSFT_scene_marker_DEFINED(_, defined, undefined) _(undefined) +#endif + #ifdef XR_MSFT_scene_understanding_serialization #define XR_MSFT_scene_understanding_serialization_DEFINED(_, defined, undefined) _(defined) #else diff --git a/remote_openxr/desktop/XrUtility/XrListFunctions.h b/remote_openxr/desktop/XrUtility/XrListFunctions.h index e559c7a..f059bbe 100644 --- a/remote_openxr/desktop/XrUtility/XrListFunctions.h +++ b/remote_openxr/desktop/XrUtility/XrListFunctions.h @@ -95,8 +95,7 @@ _(xrCreateHandMeshSpaceMSFT) \ _(xrUpdateHandMeshMSFT) -#define XR_LIST_FUNCTIONS_XR_MSFT_spatial_graph_bridge(_) \ - _(xrCreateSpatialGraphNodeSpaceMSFT) +#define XR_LIST_FUNCTIONS_XR_MSFT_spatial_graph_bridge(_) _(xrCreateSpatialGraphNodeSpaceMSFT) #define XR_LIST_FUNCTIONS_XR_MSFT_holographic_remoting(_) \ _(xrRemotingSetContextPropertiesMSFT) \ diff --git a/remote_openxr/desktop/packages.config b/remote_openxr/desktop/packages.config index 0768c88..d7490f9 100644 --- a/remote_openxr/desktop/packages.config +++ b/remote_openxr/desktop/packages.config @@ -1,6 +1,6 @@ - + - +