Skip to content

Instantly share code, notes, and snippets.

@fredemmott

fredemmott/openxr-1.0.30-to-1.0.31.patch

Last active October 29, 2023 12:48
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save fredemmott/7c67d5a5fff0d78f7cec55fb14611303 to your computer and use it in GitHub Desktop.
Save fredemmott/7c67d5a5fff0d78f7cec55fb14611303 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
openxr-1.0.30-to-1.0.31.patch
diff --git a/gen-v1.0.30/include/OXRTracing/forward_declarations.gen.hpp b/gen/include/OXRTracing/forward_declarations.gen.hpp
index eb8cc33..7a031df 100644
--- a/gen-v1.0.30/include/OXRTracing/forward_declarations.gen.hpp
+++ b/gen/include/OXRTracing/forward_declarations.gen.hpp
@@ -182,6 +182,9 @@ extern PFN_xrGetReferenceSpaceBoundsRect next_xrGetReferenceSpaceBoundsRect;
extern PFN_xrGetRenderModelPropertiesFB next_xrGetRenderModelPropertiesFB;
extern PFN_xrGetSceneComponentsMSFT next_xrGetSceneComponentsMSFT;
extern PFN_xrGetSceneComputeStateMSFT next_xrGetSceneComputeStateMSFT;
+extern PFN_xrGetSceneMarkerDecodedStringMSFT
+ next_xrGetSceneMarkerDecodedStringMSFT;
+extern PFN_xrGetSceneMarkerRawDataMSFT next_xrGetSceneMarkerRawDataMSFT;
extern PFN_xrGetSceneMeshBuffersMSFT next_xrGetSceneMeshBuffersMSFT;
extern PFN_xrGetSerializedSceneFragmentDataMSFT
next_xrGetSerializedSceneFragmentDataMSFT;
@@ -758,6 +761,15 @@ inline void OXRTL_DUMP_XrSceneCreateInfoMSFT_NEXT(
inline void OXRTL_DUMP_XrSceneDeserializeInfoMSFT_NEXT(
::TraceLoggingActivity<::OXRTracing::gTraceProvider>& oxrtlActivity,
const char*, const XrSceneDeserializeInfoMSFT& oxrtlIt);
+inline void OXRTL_DUMP_XrSceneMarkerQRCodesMSFT_NEXT(
+ ::TraceLoggingActivity<::OXRTracing::gTraceProvider>& oxrtlActivity,
+ const char*, const XrSceneMarkerQRCodesMSFT& oxrtlIt);
+inline void OXRTL_DUMP_XrSceneMarkerTypeFilterMSFT_NEXT(
+ ::TraceLoggingActivity<::OXRTracing::gTraceProvider>& oxrtlActivity,
+ const char*, const XrSceneMarkerTypeFilterMSFT& oxrtlIt);
+inline void OXRTL_DUMP_XrSceneMarkersMSFT_NEXT(
+ ::TraceLoggingActivity<::OXRTracing::gTraceProvider>& oxrtlActivity,
+ const char*, const XrSceneMarkersMSFT& oxrtlIt);
inline void OXRTL_DUMP_XrSceneMeshBuffersGetInfoMSFT_NEXT(
::TraceLoggingActivity<::OXRTracing::gTraceProvider>& oxrtlActivity,
const char*, const XrSceneMeshBuffersGetInfoMSFT& oxrtlIt);
@@ -1275,9 +1287,9 @@ XrResult XRAPI_CALL OXRTracing_xrEnumeratePerformanceMetricsCounterPathsMETA(
uint32_t* counterPathCountOutput, XrPath* counterPaths);
XrResult XRAPI_CALL OXRTracing_xrEnumeratePersistedSpatialAnchorNamesMSFT(
XrSpatialAnchorStoreConnectionMSFT spatialAnchorStore,
- uint32_t spatialAnchorNamesCapacityInput,
- uint32_t* spatialAnchorNamesCountOutput,
- XrSpatialAnchorPersistenceNameMSFT* persistedAnchorNames);
+ uint32_t spatialAnchorNameCapacityInput,
+ uint32_t* spatialAnchorNameCountOutput,
+ XrSpatialAnchorPersistenceNameMSFT* spatialAnchorNames);
XrResult XRAPI_CALL OXRTracing_xrEnumerateReferenceSpaces(XrSession session,
uint32_t spaceCapacityInput, uint32_t* spaceCountOutput,
XrReferenceSpaceType* spaces);
@@ -1393,6 +1405,12 @@ XrResult XRAPI_CALL OXRTracing_xrGetSceneComponentsMSFT(XrSceneMSFT scene,
XrSceneComponentsMSFT* components);
XrResult XRAPI_CALL OXRTracing_xrGetSceneComputeStateMSFT(
XrSceneObserverMSFT sceneObserver, XrSceneComputeStateMSFT* state);
+XrResult XRAPI_CALL OXRTracing_xrGetSceneMarkerDecodedStringMSFT(
+ XrSceneMSFT scene, const XrUuidMSFT* markerId, uint32_t bufferCapacityInput,
+ uint32_t* bufferCountOutput, char* buffer);
+XrResult XRAPI_CALL OXRTracing_xrGetSceneMarkerRawDataMSFT(XrSceneMSFT scene,
+ const XrUuidMSFT* markerId, uint32_t bufferCapacityInput,
+ uint32_t* bufferCountOutput, uint8_t* buffer);
XrResult XRAPI_CALL OXRTracing_xrGetSceneMeshBuffersMSFT(XrSceneMSFT scene,
const XrSceneMeshBuffersGetInfoMSFT* getInfo,
XrSceneMeshBuffersMSFT* buffers);
diff --git a/gen-v1.0.30/include/OXRTracing/macros.gen.hpp b/gen/include/OXRTracing/macros.gen.hpp
index dbc8278..3eae565 100644
--- a/gen-v1.0.30/include/OXRTracing/macros.gen.hpp
+++ b/gen/include/OXRTracing/macros.gen.hpp
@@ -2145,6 +2145,8 @@ inline std::string to_string(XrResult value)
return "XR_ERROR_SPATIAL_ANCHOR_NAME_NOT_FOUND_MSFT";
case XR_ERROR_SPATIAL_ANCHOR_NAME_INVALID_MSFT:
return "XR_ERROR_SPATIAL_ANCHOR_NAME_INVALID_MSFT";
+ case XR_SCENE_MARKER_DATA_NOT_STRING_MSFT:
+ return "XR_SCENE_MARKER_DATA_NOT_STRING_MSFT";
case XR_ERROR_SPACE_MAPPING_INSUFFICIENT_FB:
return "XR_ERROR_SPACE_MAPPING_INSUFFICIENT_FB";
case XR_ERROR_SPACE_LOCALIZATION_FAILED_FB:
@@ -2191,6 +2193,8 @@ inline std::string to_string(XrSceneComponentTypeMSFT value)
return "XR_SCENE_COMPONENT_TYPE_COLLIDER_MESH_MSFT";
case XR_SCENE_COMPONENT_TYPE_SERIALIZED_SCENE_FRAGMENT_MSFT:
return "XR_SCENE_COMPONENT_TYPE_SERIALIZED_SCENE_FRAGMENT_MSFT";
+ case XR_SCENE_COMPONENT_TYPE_MARKER_MSFT:
+ return "XR_SCENE_COMPONENT_TYPE_MARKER_MSFT";
default:
using BasicT = std::underlying_type_t<XrSceneComponentTypeMSFT>;
const auto basicValue = static_cast<BasicT>(value);
@@ -2242,6 +2246,8 @@ inline std::string to_string(XrSceneComputeFeatureMSFT value)
return "XR_SCENE_COMPUTE_FEATURE_COLLIDER_MESH_MSFT";
case XR_SCENE_COMPUTE_FEATURE_SERIALIZE_SCENE_MSFT:
return "XR_SCENE_COMPUTE_FEATURE_SERIALIZE_SCENE_MSFT";
+ case XR_SCENE_COMPUTE_FEATURE_MARKER_MSFT:
+ return "XR_SCENE_COMPUTE_FEATURE_MARKER_MSFT";
default:
using BasicT = std::underlying_type_t<XrSceneComputeFeatureMSFT>;
const auto basicValue = static_cast<BasicT>(value);
@@ -2281,6 +2287,49 @@ inline std::string to_string(XrSceneComputeStateMSFT value)
TraceLoggingWriteTagged(oxrtlActivity, oxrtlName, \
OXRTL_ARGS_XrSceneComputeStateMSFT(oxrtlIt, oxrtlValueName));
namespace OXRTracing {
+inline std::string to_string(XrSceneMarkerQRCodeSymbolTypeMSFT value)
+{
+ switch (value) {
+ case XR_SCENE_MARKER_QR_CODE_SYMBOL_TYPE_QR_CODE_MSFT:
+ return "XR_SCENE_MARKER_QR_CODE_SYMBOL_TYPE_QR_CODE_MSFT";
+ case XR_SCENE_MARKER_QR_CODE_SYMBOL_TYPE_MICRO_QR_CODE_MSFT:
+ return "XR_SCENE_MARKER_QR_CODE_SYMBOL_TYPE_MICRO_QR_CODE_MSFT";
+ default:
+ using BasicT
+ = std::underlying_type_t<XrSceneMarkerQRCodeSymbolTypeMSFT>;
+ const auto basicValue = static_cast<BasicT>(value);
+ return std::format(
+ "Unknown XrSceneMarkerQRCodeSymbolTypeMSFT: {}", basicValue);
+ }
+}
+} // namespace OXRTracing
+#define OXRTL_ARGS_XrSceneMarkerQRCodeSymbolTypeMSFT(oxrtlIt, oxrtlName) \
+ TraceLoggingValue(OXRTracing::to_string(oxrtlIt).c_str(), oxrtlName)
+#define OXRTL_DUMP_XrSceneMarkerQRCodeSymbolTypeMSFT( \
+ oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt) \
+ TraceLoggingWriteTagged(oxrtlActivity, oxrtlName, \
+ OXRTL_ARGS_XrSceneMarkerQRCodeSymbolTypeMSFT( \
+ oxrtlIt, oxrtlValueName));
+namespace OXRTracing {
+inline std::string to_string(XrSceneMarkerTypeMSFT value)
+{
+ switch (value) {
+ case XR_SCENE_MARKER_TYPE_QR_CODE_MSFT:
+ return "XR_SCENE_MARKER_TYPE_QR_CODE_MSFT";
+ default:
+ using BasicT = std::underlying_type_t<XrSceneMarkerTypeMSFT>;
+ const auto basicValue = static_cast<BasicT>(value);
+ return std::format("Unknown XrSceneMarkerTypeMSFT: {}", basicValue);
+ }
+}
+} // namespace OXRTracing
+#define OXRTL_ARGS_XrSceneMarkerTypeMSFT(oxrtlIt, oxrtlName) \
+ TraceLoggingValue(OXRTracing::to_string(oxrtlIt).c_str(), oxrtlName)
+#define OXRTL_DUMP_XrSceneMarkerTypeMSFT( \
+ oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt) \
+ TraceLoggingWriteTagged(oxrtlActivity, oxrtlName, \
+ OXRTL_ARGS_XrSceneMarkerTypeMSFT(oxrtlIt, oxrtlValueName));
+namespace OXRTracing {
inline std::string to_string(XrSceneObjectTypeMSFT value)
{
switch (value) {
@@ -2915,10 +2964,22 @@ inline std::string to_string(XrStructureType value)
return "XR_TYPE_GLOBAL_DIMMER_FRAME_END_INFO_ML";
case XR_TYPE_COORDINATE_SPACE_CREATE_INFO_ML:
return "XR_TYPE_COORDINATE_SPACE_CREATE_INFO_ML";
+ case XR_TYPE_EVENT_DATA_HEADSET_FIT_CHANGED_ML:
+ return "XR_TYPE_EVENT_DATA_HEADSET_FIT_CHANGED_ML";
+ case XR_TYPE_EVENT_DATA_EYE_CALIBRATION_CHANGED_ML:
+ return "XR_TYPE_EVENT_DATA_EYE_CALIBRATION_CHANGED_ML";
+ case XR_TYPE_USER_CALIBRATION_ENABLE_EVENTS_INFO_ML:
+ return "XR_TYPE_USER_CALIBRATION_ENABLE_EVENTS_INFO_ML";
case XR_TYPE_SPATIAL_ANCHOR_PERSISTENCE_INFO_MSFT:
return "XR_TYPE_SPATIAL_ANCHOR_PERSISTENCE_INFO_MSFT";
case XR_TYPE_SPATIAL_ANCHOR_FROM_PERSISTED_ANCHOR_CREATE_INFO_MSFT:
return "XR_TYPE_SPATIAL_ANCHOR_FROM_PERSISTED_ANCHOR_CREATE_INFO_MSFT";
+ case XR_TYPE_SCENE_MARKERS_MSFT:
+ return "XR_TYPE_SCENE_MARKERS_MSFT";
+ case XR_TYPE_SCENE_MARKER_TYPE_FILTER_MSFT:
+ return "XR_TYPE_SCENE_MARKER_TYPE_FILTER_MSFT";
+ case XR_TYPE_SCENE_MARKER_QR_CODES_MSFT:
+ return "XR_TYPE_SCENE_MARKER_QR_CODES_MSFT";
case XR_TYPE_SPACE_QUERY_INFO_FB:
return "XR_TYPE_SPACE_QUERY_INFO_FB";
case XR_TYPE_SPACE_QUERY_RESULTS_FB:
@@ -7319,6 +7380,106 @@ inline std::string to_string(XrWindingOrderFB value)
OXRTL_DUMP_XrSceneFrustumBoundMSFT_COMPLEX_FIELDS( \
oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt);
+#define OXRTL_ARGS_XrSceneMarkerMSFT(oxrtlIt, oxrtlName) \
+ TraceLoggingStruct(4, oxrtlName), \
+ OXRTL_ARGS_XrSceneMarkerTypeMSFT((oxrtlIt.markerType), "markerType"), \
+ OXRTL_ARGS_XrTime((oxrtlIt.lastSeenTime), "lastSeenTime"), \
+ OXRTL_ARGS_XrOffset2Df((oxrtlIt.center), "center"), \
+ OXRTL_ARGS_XrExtent2Df((oxrtlIt.size), "size")
+#define OXRTL_DUMP_XrSceneMarkerMSFT_COMPLEX_FIELDS( \
+ oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt)
+#define OXRTL_DUMP_XrSceneMarkerMSFT( \
+ oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt) \
+ TraceLoggingWriteTagged(oxrtlActivity, oxrtlName, \
+ OXRTL_ARGS_XrSceneMarkerMSFT(oxrtlIt, oxrtlValueName)); \
+ OXRTL_DUMP_XrSceneMarkerMSFT_COMPLEX_FIELDS( \
+ oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt);
+
+#define OXRTL_ARGS_XrSceneMarkerQRCodeMSFT(oxrtlIt, oxrtlName) \
+ TraceLoggingStruct(2, oxrtlName), \
+ OXRTL_ARGS_XrSceneMarkerQRCodeSymbolTypeMSFT( \
+ (oxrtlIt.symbolType), "symbolType"), \
+ OXRTL_ARGS_uint8_t((oxrtlIt.version), "version")
+#define OXRTL_DUMP_XrSceneMarkerQRCodeMSFT_COMPLEX_FIELDS( \
+ oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt)
+#define OXRTL_DUMP_XrSceneMarkerQRCodeMSFT( \
+ oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt) \
+ TraceLoggingWriteTagged(oxrtlActivity, oxrtlName, \
+ OXRTL_ARGS_XrSceneMarkerQRCodeMSFT(oxrtlIt, oxrtlValueName)); \
+ OXRTL_DUMP_XrSceneMarkerQRCodeMSFT_COMPLEX_FIELDS( \
+ oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt);
+
+#define OXRTL_ARGS_XrSceneMarkerQRCodesMSFT(oxrtlIt, oxrtlName) \
+ TraceLoggingStruct(1, oxrtlName), \
+ OXRTL_ARGS_uint32_t( \
+ (oxrtlIt.qrCodeCapacityInput), "qrCodeCapacityInput")
+#define OXRTL_DUMP_XrSceneMarkerQRCodesMSFT_COMPLEX_FIELDS( \
+ oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt) \
+ { \
+ for (decltype(oxrtlIt.qrCodeCapacityInput) XrSceneMarkerQRCodeMSFT_i \
+ = 0; \
+ XrSceneMarkerQRCodeMSFT_i < oxrtlIt.qrCodeCapacityInput; \
+ ++XrSceneMarkerQRCodeMSFT_i) { \
+ OXRTL_DUMP_XrSceneMarkerQRCodeMSFT(oxrtlActivity, \
+ oxrtlName "_qrCodes", "element", \
+ (oxrtlIt.qrCodes[XrSceneMarkerQRCodeMSFT_i])); \
+ } \
+ } \
+ OXRTL_DUMP_XrSceneMarkerQRCodesMSFT_NEXT(oxrtlActivity, oxrtlName, oxrtlIt);
+#define OXRTL_DUMP_XrSceneMarkerQRCodesMSFT( \
+ oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt) \
+ TraceLoggingWriteTagged(oxrtlActivity, oxrtlName, \
+ OXRTL_ARGS_XrSceneMarkerQRCodesMSFT(oxrtlIt, oxrtlValueName)); \
+ OXRTL_DUMP_XrSceneMarkerQRCodesMSFT_COMPLEX_FIELDS( \
+ oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt);
+
+#define OXRTL_ARGS_XrSceneMarkerTypeFilterMSFT(oxrtlIt, oxrtlName) \
+ TraceLoggingStruct(1, oxrtlName), \
+ OXRTL_ARGS_uint32_t((oxrtlIt.markerTypeCount), "markerTypeCount")
+#define OXRTL_DUMP_XrSceneMarkerTypeFilterMSFT_COMPLEX_FIELDS( \
+ oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt) \
+ { \
+ for (decltype(oxrtlIt.markerTypeCount) XrSceneMarkerTypeMSFT_i = 0; \
+ XrSceneMarkerTypeMSFT_i < oxrtlIt.markerTypeCount; \
+ ++XrSceneMarkerTypeMSFT_i) { \
+ OXRTL_DUMP_XrSceneMarkerTypeMSFT(oxrtlActivity, \
+ oxrtlName "_markerTypes", "element", \
+ (oxrtlIt.markerTypes[XrSceneMarkerTypeMSFT_i])); \
+ } \
+ } \
+ OXRTL_DUMP_XrSceneMarkerTypeFilterMSFT_NEXT( \
+ oxrtlActivity, oxrtlName, oxrtlIt);
+#define OXRTL_DUMP_XrSceneMarkerTypeFilterMSFT( \
+ oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt) \
+ TraceLoggingWriteTagged(oxrtlActivity, oxrtlName, \
+ OXRTL_ARGS_XrSceneMarkerTypeFilterMSFT(oxrtlIt, oxrtlValueName)); \
+ OXRTL_DUMP_XrSceneMarkerTypeFilterMSFT_COMPLEX_FIELDS( \
+ oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt);
+
+#define OXRTL_ARGS_XrSceneMarkersMSFT(oxrtlIt, oxrtlName) \
+ TraceLoggingStruct(1, oxrtlName), \
+ OXRTL_ARGS_uint32_t( \
+ (oxrtlIt.sceneMarkerCapacityInput), "sceneMarkerCapacityInput")
+#define OXRTL_DUMP_XrSceneMarkersMSFT_COMPLEX_FIELDS( \
+ oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt) \
+ { \
+ for (decltype(oxrtlIt.sceneMarkerCapacityInput) XrSceneMarkerMSFT_i \
+ = 0; \
+ XrSceneMarkerMSFT_i < oxrtlIt.sceneMarkerCapacityInput; \
+ ++XrSceneMarkerMSFT_i) { \
+ OXRTL_DUMP_XrSceneMarkerMSFT(oxrtlActivity, \
+ oxrtlName "_sceneMarkers", "element", \
+ (oxrtlIt.sceneMarkers[XrSceneMarkerMSFT_i])); \
+ } \
+ } \
+ OXRTL_DUMP_XrSceneMarkersMSFT_NEXT(oxrtlActivity, oxrtlName, oxrtlIt);
+#define OXRTL_DUMP_XrSceneMarkersMSFT( \
+ oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt) \
+ TraceLoggingWriteTagged(oxrtlActivity, oxrtlName, \
+ OXRTL_ARGS_XrSceneMarkersMSFT(oxrtlIt, oxrtlValueName)); \
+ OXRTL_DUMP_XrSceneMarkersMSFT_COMPLEX_FIELDS( \
+ oxrtlActivity, oxrtlName, oxrtlValueName, oxrtlIt);
+
#define OXRTL_ARGS_XrSceneMeshBuffersGetInfoMSFT(oxrtlIt, oxrtlName) \
TraceLoggingStruct(1, oxrtlName), \
OXRTL_ARGS_uint64_t((oxrtlIt.meshBufferId), "meshBufferId")
@@ -12226,9 +12387,24 @@ inline void OXRTL_DUMP_XrRenderModelPropertiesFB_NEXT(
oxrtlNextIt_XrRenderModelPropertiesFB
= reinterpret_cast<const XrBaseInStructure*>(
oxrtlNextIt_XrRenderModelPropertiesFB->next)) {
- TraceLoggingWriteTagged(oxrtlActivity, "XrRenderModelPropertiesFB_next",
- OXRTL_ARGS_XrStructureType(
- (oxrtlNextIt_XrRenderModelPropertiesFB->type), "type"));
+ switch (oxrtlNextIt_XrRenderModelPropertiesFB->type) {
+ case XR_TYPE_RENDER_MODEL_CAPABILITIES_REQUEST_FB: {
+ const auto
+ oxrtlNextIt_XrRenderModelPropertiesFB_as_XrRenderModelCapabilitiesRequestFB
+ = *reinterpret_cast<const XrRenderModelCapabilitiesRequestFB*>(
+ oxrtlNextIt_XrRenderModelPropertiesFB);
+ OXRTL_DUMP_XrRenderModelCapabilitiesRequestFB(oxrtlActivity,
+ "XrRenderModelCapabilitiesRequestFB_next",
+ "XR_TYPE_RENDER_MODEL_CAPABILITIES_REQUEST_FB",
+ oxrtlNextIt_XrRenderModelPropertiesFB_as_XrRenderModelCapabilitiesRequestFB);
+ }
+ continue;
+ default:
+ TraceLoggingWriteTagged(oxrtlActivity,
+ "XrRenderModelPropertiesFB_next",
+ OXRTL_ARGS_XrStructureType(
+ (oxrtlNextIt_XrRenderModelPropertiesFB->type), "type"));
+ }
}
}
inline void OXRTL_DUMP_XrRoomLayoutFB_NEXT(
@@ -12339,6 +12515,17 @@ inline void OXRTL_DUMP_XrSceneComponentsGetInfoMSFT_NEXT(
oxrtlNextIt_XrSceneComponentsGetInfoMSFT_as_XrScenePlaneAlignmentFilterInfoMSFT);
}
continue;
+ case XR_TYPE_SCENE_MARKER_TYPE_FILTER_MSFT: {
+ const auto
+ oxrtlNextIt_XrSceneComponentsGetInfoMSFT_as_XrSceneMarkerTypeFilterMSFT
+ = *reinterpret_cast<const XrSceneMarkerTypeFilterMSFT*>(
+ oxrtlNextIt_XrSceneComponentsGetInfoMSFT);
+ OXRTL_DUMP_XrSceneMarkerTypeFilterMSFT(oxrtlActivity,
+ "XrSceneMarkerTypeFilterMSFT_next",
+ "XR_TYPE_SCENE_MARKER_TYPE_FILTER_MSFT",
+ oxrtlNextIt_XrSceneComponentsGetInfoMSFT_as_XrSceneMarkerTypeFilterMSFT);
+ }
+ continue;
default:
TraceLoggingWriteTagged(oxrtlActivity,
"XrSceneComponentsGetInfoMSFT_next",
@@ -12400,6 +12587,26 @@ inline void OXRTL_DUMP_XrSceneComponentsMSFT_NEXT(
oxrtlNextIt_XrSceneComponentsMSFT_as_XrSceneMeshesMSFT);
}
continue;
+ case XR_TYPE_SCENE_MARKERS_MSFT: {
+ const auto oxrtlNextIt_XrSceneComponentsMSFT_as_XrSceneMarkersMSFT
+ = *reinterpret_cast<const XrSceneMarkersMSFT*>(
+ oxrtlNextIt_XrSceneComponentsMSFT);
+ OXRTL_DUMP_XrSceneMarkersMSFT(oxrtlActivity,
+ "XrSceneMarkersMSFT_next", "XR_TYPE_SCENE_MARKERS_MSFT",
+ oxrtlNextIt_XrSceneComponentsMSFT_as_XrSceneMarkersMSFT);
+ }
+ continue;
+ case XR_TYPE_SCENE_MARKER_QR_CODES_MSFT: {
+ const auto
+ oxrtlNextIt_XrSceneComponentsMSFT_as_XrSceneMarkerQRCodesMSFT
+ = *reinterpret_cast<const XrSceneMarkerQRCodesMSFT*>(
+ oxrtlNextIt_XrSceneComponentsMSFT);
+ OXRTL_DUMP_XrSceneMarkerQRCodesMSFT(oxrtlActivity,
+ "XrSceneMarkerQRCodesMSFT_next",
+ "XR_TYPE_SCENE_MARKER_QR_CODES_MSFT",
+ oxrtlNextIt_XrSceneComponentsMSFT_as_XrSceneMarkerQRCodesMSFT);
+ }
+ continue;
default:
TraceLoggingWriteTagged(oxrtlActivity, "XrSceneComponentsMSFT_next",
OXRTL_ARGS_XrStructureType(
@@ -12437,6 +12644,51 @@ inline void OXRTL_DUMP_XrSceneDeserializeInfoMSFT_NEXT(
(oxrtlNextIt_XrSceneDeserializeInfoMSFT->type), "type"));
}
}
+inline void OXRTL_DUMP_XrSceneMarkerQRCodesMSFT_NEXT(
+ ::TraceLoggingActivity<::OXRTracing::gTraceProvider>& oxrtlActivity,
+ const char*, const XrSceneMarkerQRCodesMSFT& oxrtlIt)
+{
+ for (auto oxrtlNextIt_XrSceneMarkerQRCodesMSFT
+ = reinterpret_cast<const XrBaseInStructure*>(oxrtlIt.next);
+ oxrtlNextIt_XrSceneMarkerQRCodesMSFT;
+ oxrtlNextIt_XrSceneMarkerQRCodesMSFT
+ = reinterpret_cast<const XrBaseInStructure*>(
+ oxrtlNextIt_XrSceneMarkerQRCodesMSFT->next)) {
+ TraceLoggingWriteTagged(oxrtlActivity, "XrSceneMarkerQRCodesMSFT_next",
+ OXRTL_ARGS_XrStructureType(
+ (oxrtlNextIt_XrSceneMarkerQRCodesMSFT->type), "type"));
+ }
+}
+inline void OXRTL_DUMP_XrSceneMarkerTypeFilterMSFT_NEXT(
+ ::TraceLoggingActivity<::OXRTracing::gTraceProvider>& oxrtlActivity,
+ const char*, const XrSceneMarkerTypeFilterMSFT& oxrtlIt)
+{
+ for (auto oxrtlNextIt_XrSceneMarkerTypeFilterMSFT
+ = reinterpret_cast<const XrBaseInStructure*>(oxrtlIt.next);
+ oxrtlNextIt_XrSceneMarkerTypeFilterMSFT;
+ oxrtlNextIt_XrSceneMarkerTypeFilterMSFT
+ = reinterpret_cast<const XrBaseInStructure*>(
+ oxrtlNextIt_XrSceneMarkerTypeFilterMSFT->next)) {
+ TraceLoggingWriteTagged(oxrtlActivity,
+ "XrSceneMarkerTypeFilterMSFT_next",
+ OXRTL_ARGS_XrStructureType(
+ (oxrtlNextIt_XrSceneMarkerTypeFilterMSFT->type), "type"));
+ }
+}
+inline void OXRTL_DUMP_XrSceneMarkersMSFT_NEXT(
+ ::TraceLoggingActivity<::OXRTracing::gTraceProvider>& oxrtlActivity,
+ const char*, const XrSceneMarkersMSFT& oxrtlIt)
+{
+ for (auto oxrtlNextIt_XrSceneMarkersMSFT
+ = reinterpret_cast<const XrBaseInStructure*>(oxrtlIt.next);
+ oxrtlNextIt_XrSceneMarkersMSFT; oxrtlNextIt_XrSceneMarkersMSFT
+ = reinterpret_cast<const XrBaseInStructure*>(
+ oxrtlNextIt_XrSceneMarkersMSFT->next)) {
+ TraceLoggingWriteTagged(oxrtlActivity, "XrSceneMarkersMSFT_next",
+ OXRTL_ARGS_XrStructureType(
+ (oxrtlNextIt_XrSceneMarkersMSFT->type), "type"));
+ }
+}
inline void OXRTL_DUMP_XrSceneMeshBuffersGetInfoMSFT_NEXT(
::TraceLoggingActivity<::OXRTracing::gTraceProvider>& oxrtlActivity,
const char*, const XrSceneMeshBuffersGetInfoMSFT& oxrtlIt)
@@ -13936,17 +14188,6 @@ inline void OXRTL_DUMP_XrSystemProperties_NEXT(
oxrtlNextIt_XrSystemProperties_as_XrSystemRenderModelPropertiesFB);
}
continue;
- case XR_TYPE_RENDER_MODEL_CAPABILITIES_REQUEST_FB: {
- const auto
- oxrtlNextIt_XrSystemProperties_as_XrRenderModelCapabilitiesRequestFB
- = *reinterpret_cast<const XrRenderModelCapabilitiesRequestFB*>(
- oxrtlNextIt_XrSystemProperties);
- OXRTL_DUMP_XrRenderModelCapabilitiesRequestFB(oxrtlActivity,
- "XrRenderModelCapabilitiesRequestFB_next",
- "XR_TYPE_RENDER_MODEL_CAPABILITIES_REQUEST_FB",
- oxrtlNextIt_XrSystemProperties_as_XrRenderModelCapabilitiesRequestFB);
- }
- continue;
case XR_TYPE_SYSTEM_FOVEATED_RENDERING_PROPERTIES_VARJO: {
const auto
oxrtlNextIt_XrSystemProperties_as_XrSystemFoveatedRenderingPropertiesVARJO
diff --git a/gen-v1.0.30/src/layer.gen.0.cpp b/gen/src/layer.gen.0.cpp
index a2a58ce..bdb14cc 100644
--- a/gen-v1.0.30/src/layer.gen.0.cpp
+++ b/gen/src/layer.gen.0.cpp
@@ -211,6 +211,10 @@ PFN_xrGetReferenceSpaceBoundsRect next_xrGetReferenceSpaceBoundsRect{ nullptr };
PFN_xrGetRenderModelPropertiesFB next_xrGetRenderModelPropertiesFB{ nullptr };
PFN_xrGetSceneComponentsMSFT next_xrGetSceneComponentsMSFT{ nullptr };
PFN_xrGetSceneComputeStateMSFT next_xrGetSceneComputeStateMSFT{ nullptr };
+PFN_xrGetSceneMarkerDecodedStringMSFT next_xrGetSceneMarkerDecodedStringMSFT{
+ nullptr
+};
+PFN_xrGetSceneMarkerRawDataMSFT next_xrGetSceneMarkerRawDataMSFT{ nullptr };
PFN_xrGetSceneMeshBuffersMSFT next_xrGetSceneMeshBuffersMSFT{ nullptr };
PFN_xrGetSerializedSceneFragmentDataMSFT
next_xrGetSerializedSceneFragmentDataMSFT{ nullptr };
@@ -2881,9 +2885,9 @@ XrResult XRAPI_CALL OXRTracing_xrEnumeratePerformanceMetricsCounterPathsMETA(
XrResult XRAPI_CALL OXRTracing_xrEnumeratePersistedSpatialAnchorNamesMSFT(
XrSpatialAnchorStoreConnectionMSFT spatialAnchorStore,
- uint32_t spatialAnchorNamesCapacityInput,
- uint32_t* spatialAnchorNamesCountOutput,
- XrSpatialAnchorPersistenceNameMSFT* persistedAnchorNames)
+ uint32_t spatialAnchorNameCapacityInput,
+ uint32_t* spatialAnchorNameCountOutput,
+ XrSpatialAnchorPersistenceNameMSFT* spatialAnchorNames)
{
TraceLoggingActivity<gTraceProvider> localActivity;
@@ -2891,19 +2895,19 @@ XrResult XRAPI_CALL OXRTracing_xrEnumeratePersistedSpatialAnchorNamesMSFT(
"xrEnumeratePersistedSpatialAnchorNamesMSFT",
OXRTL_ARGS_XrSpatialAnchorStoreConnectionMSFT(
spatialAnchorStore, "spatialAnchorStore"),
- OXRTL_ARGS_uint32_t(spatialAnchorNamesCapacityInput,
- "spatialAnchorNamesCapacityInput"));
+ OXRTL_ARGS_uint32_t(
+ spatialAnchorNameCapacityInput, "spatialAnchorNameCapacityInput"));
try {
const auto ret = next_xrEnumeratePersistedSpatialAnchorNamesMSFT(
- spatialAnchorStore, spatialAnchorNamesCapacityInput,
- spatialAnchorNamesCountOutput, persistedAnchorNames);
+ spatialAnchorStore, spatialAnchorNameCapacityInput,
+ spatialAnchorNameCountOutput, spatialAnchorNames);
TraceLoggingWriteStop(localActivity,
"xrEnumeratePersistedSpatialAnchorNamesMSFT",
OXRTL_ARGS_XrResult(ret, "XrResult"),
- OXRTL_ARGS_uint32_t((*spatialAnchorNamesCountOutput),
- "spatialAnchorNamesCountOutput"));
+ OXRTL_ARGS_uint32_t((*spatialAnchorNameCountOutput),
+ "spatialAnchorNameCountOutput"));
return ret;
} catch (const std::exception& e) {
@@ -4357,6 +4361,75 @@ XrResult XRAPI_CALL OXRTracing_xrGetSceneComputeStateMSFT(
}
}
+XrResult XRAPI_CALL OXRTracing_xrGetSceneMarkerDecodedStringMSFT(
+ XrSceneMSFT scene, const XrUuidMSFT* markerId, uint32_t bufferCapacityInput,
+ uint32_t* bufferCountOutput, char* buffer)
+{
+
+ TraceLoggingActivity<gTraceProvider> localActivity;
+ TraceLoggingWriteStart(localActivity, "xrGetSceneMarkerDecodedStringMSFT",
+ OXRTL_ARGS_XrSceneMSFT(scene, "scene"),
+ OXRTL_ARGS_uint32_t(bufferCapacityInput, "bufferCapacityInput"));
+ OXRTL_DUMP_XrUuidMSFT(localActivity, "xrGetSceneMarkerDecodedStringMSFT",
+ "markerId", (*markerId));
+ try {
+ const auto ret = next_xrGetSceneMarkerDecodedStringMSFT(
+ scene, markerId, bufferCapacityInput, bufferCountOutput, buffer);
+
+ TraceLoggingWriteStop(localActivity,
+ "xrGetSceneMarkerDecodedStringMSFT",
+ OXRTL_ARGS_XrResult(ret, "XrResult"),
+ OXRTL_ARGS_uint32_t((*bufferCountOutput), "bufferCountOutput"));
+
+ return ret;
+ } catch (const std::exception& e) {
+ TraceLoggingWriteStop(localActivity,
+ "xrGetSceneMarkerDecodedStringMSFT",
+ TraceLoggingValue(e.what(), "exception"));
+ throw;
+ } catch (...) {
+ TraceLoggingWriteStop(localActivity,
+ "xrGetSceneMarkerDecodedStringMSFT",
+ TraceLoggingValue(
+ "Got a C++ exception that is not an std exception",
+ "exception"));
+ throw;
+ }
+}
+
+XrResult XRAPI_CALL OXRTracing_xrGetSceneMarkerRawDataMSFT(XrSceneMSFT scene,
+ const XrUuidMSFT* markerId, uint32_t bufferCapacityInput,
+ uint32_t* bufferCountOutput, uint8_t* buffer)
+{
+
+ TraceLoggingActivity<gTraceProvider> localActivity;
+ TraceLoggingWriteStart(localActivity, "xrGetSceneMarkerRawDataMSFT",
+ OXRTL_ARGS_XrSceneMSFT(scene, "scene"),
+ OXRTL_ARGS_uint32_t(bufferCapacityInput, "bufferCapacityInput"));
+ OXRTL_DUMP_XrUuidMSFT(
+ localActivity, "xrGetSceneMarkerRawDataMSFT", "markerId", (*markerId));
+ try {
+ const auto ret = next_xrGetSceneMarkerRawDataMSFT(
+ scene, markerId, bufferCapacityInput, bufferCountOutput, buffer);
+
+ TraceLoggingWriteStop(localActivity, "xrGetSceneMarkerRawDataMSFT",
+ OXRTL_ARGS_XrResult(ret, "XrResult"),
+ OXRTL_ARGS_uint32_t((*bufferCountOutput), "bufferCountOutput"));
+
+ return ret;
+ } catch (const std::exception& e) {
+ TraceLoggingWriteStop(localActivity, "xrGetSceneMarkerRawDataMSFT",
+ TraceLoggingValue(e.what(), "exception"));
+ throw;
+ } catch (...) {
+ TraceLoggingWriteStop(localActivity, "xrGetSceneMarkerRawDataMSFT",
+ TraceLoggingValue(
+ "Got a C++ exception that is not an std exception",
+ "exception"));
+ throw;
+ }
+}
+
XrResult XRAPI_CALL OXRTracing_xrGetSceneMeshBuffersMSFT(XrSceneMSFT scene,
const XrSceneMeshBuffersGetInfoMSFT* getInfo,
XrSceneMeshBuffersMSFT* buffers)
@@ -8422,6 +8495,23 @@ XrResult XRAPI_CALL OXRTracing_xrGetInstanceProcAddr(
return ret;
}
+ if (name == "xrGetSceneMarkerDecodedStringMSFT") {
+ next_xrGetSceneMarkerDecodedStringMSFT
+ = reinterpret_cast<PFN_xrGetSceneMarkerDecodedStringMSFT>(
+ *function);
+ *function = reinterpret_cast<PFN_xrVoidFunction>(
+ &OXRTracing_xrGetSceneMarkerDecodedStringMSFT);
+ return ret;
+ }
+
+ if (name == "xrGetSceneMarkerRawDataMSFT") {
+ next_xrGetSceneMarkerRawDataMSFT
+ = reinterpret_cast<PFN_xrGetSceneMarkerRawDataMSFT>(*function);
+ *function = reinterpret_cast<PFN_xrVoidFunction>(
+ &OXRTracing_xrGetSceneMarkerRawDataMSFT);
+ return ret;
+ }
+
if (name == "xrGetSceneMeshBuffersMSFT") {
next_xrGetSceneMeshBuffersMSFT
= reinterpret_cast<PFN_xrGetSceneMeshBuffersMSFT>(*function);
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment