wineopenxr: Update to 1.1.36 registry version.

CW-Bug-Id: #23689

OpenXR-SDK

@@ -1 +1 @@
-Subproject commit 58a00cf85c39ad5ec4dc43a769624e420c06179a
+Subproject commit 8899a91c17ce9618f565f42408b47db1d6e9ccc7

wineopenxr/make_openxr

@@ -62,7 +62,7 @@ LOGGER = logging.Logger("openxr")
 LOGGER.addHandler(logging.StreamHandler())
 
 XR_XML_VERSION = "1.0.11"
-WINE_XR_VERSION = (1, 0)
+WINE_XR_VERSION = (1, 1)
 
 # Filenames to create.
 WINE_OPENXR_H = "./wineopenxr.h"
@@ -145,6 +145,9 @@ DRIVER_VERSION = 1
 FUNCTION_OVERRIDES = {
     # Global functions
     "xrCreateInstance" : {"dispatch" : False, "driver" : True, "thunk" : False},
+    "xrCreateApiLayerInstance" : {"dispatch" : False, "driver" : True, "thunk" : False},
+    "xrNegotiateLoaderRuntimeInterface" : {"dispatch" : False, "driver" : True, "thunk" : False},
+    "xrNegotiateLoaderApiLayerInterface" : {"dispatch" : False, "driver" : False, "thunk" : False},
     "xrDestroyInstance" : {"dispatch" : False, "driver" : True, "thunk" : False},
 
     "xrCreateSession" : {"dispatch" : True, "driver" : True, "thunk" : False},
@@ -174,6 +177,12 @@ FUNCTION_OVERRIDES = {
     "xrEndFrame" : {"dispatch" : True, "driver" : True, "thunk" : False},
 }
 
+NOT_OUR_FUNCTIONS = [
+    # xr.xml defines that as a part of XR_LOADER_VERSION_1_0 commands but it looks like only layers should provide it
+    # (through dll export).
+    "xrNegotiateLoaderApiLayerInterface",
+]
+
 STRUCT_CHAIN_CONVERSIONS = [
     "XrInstanceCreateInfo",
 ]
@@ -1352,7 +1361,7 @@ class XrParam(object):
                 self.format_conv = "wine_dbgstr_longlong({0})"
             elif self.type == "HANDLE":
                 self.format_str = "%p"
-            elif self.type in ["XrSystemId", "XrPath", "XrTime", "XrDuration", "XrControllerModelKeyMSFT"]:
+            elif self.type in ["XrSystemId", "XrPath", "XrTime", "XrDuration", "XrControllerModelKeyMSFT", "XrMarkerML"]:
                 self.format_str = "0x%s"
                 self.format_conv = "wine_dbgstr_longlong({0})"
             elif self.type in ["XrVector2f"]:
@@ -2538,7 +2547,8 @@ class XrRegistry(object):
         # calls out in the 3 types of functions: device, global and instance.
         instance_funcs = []
         for func in funcs.values():
-            instance_funcs.append(func)
+            if not func.name in NOT_OUR_FUNCTIONS:
+                instance_funcs.append(func)
 
         # Sort function lists by name and store them.
         self.instance_funcs = sorted(instance_funcs, key=lambda func: func.name)

wineopenxr/openxr.c

@@ -35,6 +35,11 @@
 #pragma pop_macro("_WIN32")
 #pragma pop_macro("__cdecl")
 
+typedef struct XrApiLayerCreateInfo XrApiLayerCreateInfo;
+typedef struct XrNegotiateLoaderInfo XrNegotiateLoaderInfo;
+typedef struct XrNegotiateApiLayerRequest XrNegotiateApiLayerRequest;
+typedef struct XrNegotiateRuntimeRequest XrNegotiateRuntimeRequest;
+
 #include "openxr_private.h"
 
 #include "wine/vulkan_driver.h"
@@ -858,6 +863,13 @@ cleanup:
     return res;
 }
 
+XrResult WINAPI wine_xrCreateApiLayerInstance(const XrInstanceCreateInfo *info, const XrApiLayerCreateInfo *layerInfo, XrInstance *instance)
+{
+    WINE_TRACE("%p, %p, %p\n", info, layerInfo, instance);
+
+    return wine_xrCreateInstance(info, instance);
+}
+
 XrResult WINAPI wine_xrDestroyInstance(XrInstance instance)
 {
     wine_XrInstance *wine_instance = (wine_XrInstance *)instance;
@@ -1061,10 +1073,10 @@ XrResult WINAPI wine_xrDestroySession(XrSession session)
     return XR_SUCCESS;
 }
 
-XrResult WINAPI wine_xrNegotiateLoaderRuntimeInterface(
+XrResult WINAPI wine_xrNegotiateLoaderRuntimeInterface(const XrNegotiateLoaderInfo *info, XrNegotiateRuntimeRequest *request)
-        const XrNegotiateLoaderInfo_win *loaderInfo,
-        XrNegotiateRuntimeRequest_win *runtimeRequest)
 {
+    const XrNegotiateLoaderInfo_win *loaderInfo = (const XrNegotiateLoaderInfo_win *)info;
+    XrNegotiateRuntimeRequest_win *runtimeRequest = (XrNegotiateRuntimeRequest_win *)request;
     XrResult res;
 
     WINE_TRACE("%p %p\n", loaderInfo, runtimeRequest);
@@ -1359,6 +1371,8 @@ XrResult WINAPI wine_xrPollEvent(XrInstance instance, XrEventDataBuffer *eventDa
 
     res = xrPollEvent(((wine_XrInstance *)instance)->instance, eventData);
 
+    WINE_TRACE("eventData->type %#x\n", eventData->type);
+
     if(res == XR_SUCCESS){
         switch(eventData->type){
             case XR_TYPE_EVENT_DATA_INTERACTION_PROFILE_CHANGED:

wineopenxr/openxr_thunks.h

@@ -3,7 +3,7 @@
  * This file is generated from OpenXR xr.xml file covered
  * by the following copyright and permission notice:
  *
- * Copyright (c) 2017-2023, The Khronos Group Inc.
+ * Copyright (c) 2017-2024, The Khronos Group Inc.
  *
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
@@ -22,11 +22,12 @@
 #ifndef __WINE_OPENXR_THUNKS_H
 #define __WINE_OPENXR_THUNKS_H
 
-#define WINE_XR_VERSION XR_API_VERSION_1_0
+#define WINE_XR_VERSION XR_API_VERSION_1_1
 
 /* Functions for which we have custom implementations outside of the thunks. */
 XrResult WINAPI wine_xrConvertTimeToWin32PerformanceCounterKHR(XrInstance instance, XrTime time, LARGE_INTEGER *performanceCounter);
 XrResult WINAPI wine_xrConvertWin32PerformanceCounterToTimeKHR(XrInstance instance, const LARGE_INTEGER *performanceCounter, XrTime *time);
+XrResult WINAPI wine_xrCreateApiLayerInstance(const XrInstanceCreateInfo *info, const XrApiLayerCreateInfo *layerInfo, XrInstance *instance);
 XrResult WINAPI wine_xrCreateInstance(const XrInstanceCreateInfo *createInfo, XrInstance *instance);
 XrResult WINAPI wine_xrCreateSession(XrInstance instance, const XrSessionCreateInfo *createInfo, XrSession *session);
 XrResult WINAPI wine_xrCreateSwapchain(XrSession session, const XrSwapchainCreateInfo *createInfo, XrSwapchain *swapchain);
@@ -47,6 +48,8 @@ XrResult WINAPI wine_xrGetVulkanDeviceExtensionsKHR(XrInstance instance, XrSyste
 XrResult WINAPI wine_xrGetVulkanGraphicsDevice2KHR(XrInstance instance, const XrVulkanGraphicsDeviceGetInfoKHR *getInfo, VkPhysicalDevice *vulkanPhysicalDevice);
 XrResult WINAPI wine_xrGetVulkanGraphicsDeviceKHR(XrInstance instance, XrSystemId systemId, VkInstance vkInstance, VkPhysicalDevice *vkPhysicalDevice);
 XrResult WINAPI wine_xrGetVulkanInstanceExtensionsKHR(XrInstance instance, XrSystemId systemId, uint32_t bufferCapacityInput, uint32_t *bufferCountOutput, char *buffer);
+XrResult WINAPI wine_xrNegotiateLoaderApiLayerInterface(const XrNegotiateLoaderInfo *loaderInfo, const char *layerName, XrNegotiateApiLayerRequest *apiLayerRequest);
+XrResult WINAPI wine_xrNegotiateLoaderRuntimeInterface(const XrNegotiateLoaderInfo *loaderInfo, XrNegotiateRuntimeRequest *runtimeRequest);
 XrResult WINAPI wine_xrPollEvent(XrInstance instance, XrEventDataBuffer *eventData);
 
 /* Private thunks */
@@ -68,6 +71,30 @@ typedef struct XrMarkerSpaceCreateInfoVARJO_host
 } XrMarkerSpaceCreateInfoVARJO_host;
 
 
+typedef struct XrPlaneDetectorLocationEXT_host
+{
+    XrStructureType type;
+    void *next;
+    uint64_t planeId;
+    XrSpaceLocationFlags locationFlags;
+    XrPosef pose;
+    XrExtent2Df extents;
+    XrPlaneDetectorOrientationEXT orientation;
+    XrPlaneDetectorSemanticTypeEXT semanticType;
+    uint32_t polygonBufferCount;
+} XrPlaneDetectorLocationEXT_host;
+
+
+typedef struct XrPlaneDetectorLocationsEXT_host
+{
+    XrStructureType type;
+    void *next;
+    uint32_t planeLocationCapacityInput;
+    uint32_t planeLocationCountOutput;
+    XrPlaneDetectorLocationEXT_host *planeLocations;
+} XrPlaneDetectorLocationsEXT_host;
+
+
 typedef struct XrSceneMeshBuffersGetInfoMSFT_host
 {
     XrStructureType type;
@@ -92,20 +119,28 @@ void free_XrInstanceCreateInfo_struct_chain(XrInstanceCreateInfo *s);
 /* For use by xrInstance and children */
 struct openxr_instance_funcs
 {
+    XrResult (*p_xrAcquireEnvironmentDepthImageMETA)(XrEnvironmentDepthProviderMETA, const XrEnvironmentDepthImageAcquireInfoMETA *, XrEnvironmentDepthImageMETA *);
     XrResult (*p_xrAcquireSwapchainImage)(XrSwapchain, const XrSwapchainImageAcquireInfo *, uint32_t *);
     XrResult (*p_xrApplyForceFeedbackCurlMNDX)(XrHandTrackerEXT, const XrForceFeedbackCurlApplyLocationsMNDX *);
     XrResult (*p_xrApplyFoveationHTC)(XrSession, const XrFoveationApplyInfoHTC *);
     XrResult (*p_xrApplyHapticFeedback)(XrSession, const XrHapticActionInfo *, const XrHapticBaseHeader *);
     XrResult (*p_xrAttachSessionActionSets)(XrSession, const XrSessionActionSetsAttachInfo *);
     XrResult (*p_xrBeginFrame)(XrSession, const XrFrameBeginInfo *);
+    XrResult (*p_xrBeginPlaneDetectionEXT)(XrPlaneDetectorEXT, const XrPlaneDetectorBeginInfoEXT *);
     XrResult (*p_xrBeginSession)(XrSession, const XrSessionBeginInfo *);
+    XrResult (*p_xrCancelFutureEXT)(XrInstance, const XrFutureCancelInfoEXT *);
+    XrResult (*p_xrChangeVirtualKeyboardTextContextMETA)(XrVirtualKeyboardMETA, const XrVirtualKeyboardTextContextChangeInfoMETA *);
     XrResult (*p_xrClearSpatialAnchorStoreMSFT)(XrSpatialAnchorStoreConnectionMSFT);
     XrResult (*p_xrComputeNewSceneMSFT)(XrSceneObserverMSFT, const XrNewSceneComputeInfoMSFT *);
     XrResult (*p_xrCreateAction)(XrActionSet, const XrActionCreateInfo *, XrAction *);
     XrResult (*p_xrCreateActionSet)(XrInstance, const XrActionSetCreateInfo *, XrActionSet *);
     XrResult (*p_xrCreateActionSpace)(XrSession, const XrActionSpaceCreateInfo *, XrSpace *);
     XrResult (*p_xrCreateBodyTrackerFB)(XrSession, const XrBodyTrackerCreateInfoFB *, XrBodyTrackerFB *);
+    XrResult (*p_xrCreateEnvironmentDepthProviderMETA)(XrSession, const XrEnvironmentDepthProviderCreateInfoMETA *, XrEnvironmentDepthProviderMETA *);
+    XrResult (*p_xrCreateEnvironmentDepthSwapchainMETA)(XrEnvironmentDepthProviderMETA, const XrEnvironmentDepthSwapchainCreateInfoMETA *, XrEnvironmentDepthSwapchainMETA *);
+    XrResult (*p_xrCreateExportedLocalizationMapML)(XrSession, const XrUuidEXT *, XrExportedLocalizationMapML *);
     XrResult (*p_xrCreateEyeTrackerFB)(XrSession, const XrEyeTrackerCreateInfoFB *, XrEyeTrackerFB *);
+    XrResult (*p_xrCreateFaceTracker2FB)(XrSession, const XrFaceTrackerCreateInfo2FB *, XrFaceTracker2FB *);
     XrResult (*p_xrCreateFaceTrackerFB)(XrSession, const XrFaceTrackerCreateInfoFB *, XrFaceTrackerFB *);
     XrResult (*p_xrCreateFacialTrackerHTC)(XrSession, const XrFacialTrackerCreateInfoHTC *, XrFacialTrackerHTC *);
     XrResult (*p_xrCreateFoveationProfileFB)(XrSession, const XrFoveationProfileCreateInfoFB *, XrFoveationProfileFB *);
@@ -117,14 +152,18 @@ struct openxr_instance_funcs
 #else
     XrResult (*p_xrCreateKeyboardSpaceFB)(XrSession, const XrKeyboardSpaceCreateInfoFB *, XrSpace *);
 #endif
+    XrResult (*p_xrCreateMarkerDetectorML)(XrSession, const XrMarkerDetectorCreateInfoML *, XrMarkerDetectorML *);
+    XrResult (*p_xrCreateMarkerSpaceML)(XrSession, const XrMarkerSpaceCreateInfoML *, XrSpace *);
 #if defined(USE_STRUCT_CONVERSION)
     XrResult (*p_xrCreateMarkerSpaceVARJO)(XrSession, const XrMarkerSpaceCreateInfoVARJO_host *, XrSpace *);
 #else
     XrResult (*p_xrCreateMarkerSpaceVARJO)(XrSession, const XrMarkerSpaceCreateInfoVARJO *, XrSpace *);
 #endif
+    XrResult (*p_xrCreatePassthroughColorLutMETA)(XrPassthroughFB, const XrPassthroughColorLutCreateInfoMETA *, XrPassthroughColorLutMETA *);
     XrResult (*p_xrCreatePassthroughFB)(XrSession, const XrPassthroughCreateInfoFB *, XrPassthroughFB *);
     XrResult (*p_xrCreatePassthroughHTC)(XrSession, const XrPassthroughCreateInfoHTC *, XrPassthroughHTC *);
     XrResult (*p_xrCreatePassthroughLayerFB)(XrSession, const XrPassthroughLayerCreateInfoFB *, XrPassthroughLayerFB *);
+    XrResult (*p_xrCreatePlaneDetectorEXT)(XrSession, const XrPlaneDetectorCreateInfoEXT *, XrPlaneDetectorEXT *);
     XrResult (*p_xrCreateReferenceSpace)(XrSession, const XrReferenceSpaceCreateInfo *, XrSpace *);
     XrResult (*p_xrCreateSceneMSFT)(XrSceneObserverMSFT, const XrSceneCreateInfoMSFT *, XrSceneMSFT *);
     XrResult (*p_xrCreateSceneObserverMSFT)(XrSession, const XrSceneObserverCreateInfoMSFT *, XrSceneObserverMSFT *);
@@ -132,27 +171,37 @@ struct openxr_instance_funcs
     XrResult (*p_xrCreateSpaceUserFB)(XrSession, const XrSpaceUserCreateInfoFB *, XrSpaceUserFB *);
     XrResult (*p_xrCreateSpatialAnchorFB)(XrSession, const XrSpatialAnchorCreateInfoFB *, XrAsyncRequestIdFB *);
     XrResult (*p_xrCreateSpatialAnchorFromPersistedNameMSFT)(XrSession, const XrSpatialAnchorFromPersistedAnchorCreateInfoMSFT *, XrSpatialAnchorMSFT *);
+    XrResult (*p_xrCreateSpatialAnchorHTC)(XrSession, const XrSpatialAnchorCreateInfoHTC *, XrSpace *);
     XrResult (*p_xrCreateSpatialAnchorMSFT)(XrSession, const XrSpatialAnchorCreateInfoMSFT *, XrSpatialAnchorMSFT *);
     XrResult (*p_xrCreateSpatialAnchorSpaceMSFT)(XrSession, const XrSpatialAnchorSpaceCreateInfoMSFT *, XrSpace *);
     XrResult (*p_xrCreateSpatialAnchorStoreConnectionMSFT)(XrSession, XrSpatialAnchorStoreConnectionMSFT *);
     XrResult (*p_xrCreateSpatialGraphNodeSpaceMSFT)(XrSession, const XrSpatialGraphNodeSpaceCreateInfoMSFT *, XrSpace *);
     XrResult (*p_xrCreateSwapchain)(XrSession, const XrSwapchainCreateInfo *, XrSwapchain *);
     XrResult (*p_xrCreateTriangleMeshFB)(XrSession, const XrTriangleMeshCreateInfoFB *, XrTriangleMeshFB *);
+    XrResult (*p_xrCreateVirtualKeyboardMETA)(XrSession, const XrVirtualKeyboardCreateInfoMETA *, XrVirtualKeyboardMETA *);
+    XrResult (*p_xrCreateVirtualKeyboardSpaceMETA)(XrSession, XrVirtualKeyboardMETA, const XrVirtualKeyboardSpaceCreateInfoMETA *, XrSpace *);
     XrResult (*p_xrCreateVulkanDeviceKHR)(XrInstance, const XrVulkanDeviceCreateInfoKHR *, VkDevice *, VkResult *);
     XrResult (*p_xrCreateVulkanInstanceKHR)(XrInstance, const XrVulkanInstanceCreateInfoKHR *, VkInstance *, VkResult *);
     XrResult (*p_xrDeserializeSceneMSFT)(XrSceneObserverMSFT, const XrSceneDeserializeInfoMSFT *);
     XrResult (*p_xrDestroyAction)(XrAction);
     XrResult (*p_xrDestroyActionSet)(XrActionSet);
     XrResult (*p_xrDestroyBodyTrackerFB)(XrBodyTrackerFB);
+    XrResult (*p_xrDestroyEnvironmentDepthProviderMETA)(XrEnvironmentDepthProviderMETA);
+    XrResult (*p_xrDestroyEnvironmentDepthSwapchainMETA)(XrEnvironmentDepthSwapchainMETA);
+    XrResult (*p_xrDestroyExportedLocalizationMapML)(XrExportedLocalizationMapML);
     XrResult (*p_xrDestroyEyeTrackerFB)(XrEyeTrackerFB);
+    XrResult (*p_xrDestroyFaceTracker2FB)(XrFaceTracker2FB);
     XrResult (*p_xrDestroyFaceTrackerFB)(XrFaceTrackerFB);
     XrResult (*p_xrDestroyFacialTrackerHTC)(XrFacialTrackerHTC);
     XrResult (*p_xrDestroyFoveationProfileFB)(XrFoveationProfileFB);
     XrResult (*p_xrDestroyGeometryInstanceFB)(XrGeometryInstanceFB);
     XrResult (*p_xrDestroyHandTrackerEXT)(XrHandTrackerEXT);
+    XrResult (*p_xrDestroyMarkerDetectorML)(XrMarkerDetectorML);
+    XrResult (*p_xrDestroyPassthroughColorLutMETA)(XrPassthroughColorLutMETA);
     XrResult (*p_xrDestroyPassthroughFB)(XrPassthroughFB);
     XrResult (*p_xrDestroyPassthroughHTC)(XrPassthroughHTC);
     XrResult (*p_xrDestroyPassthroughLayerFB)(XrPassthroughLayerFB);
+    XrResult (*p_xrDestroyPlaneDetectorEXT)(XrPlaneDetectorEXT);
     XrResult (*p_xrDestroySceneMSFT)(XrSceneMSFT);
     XrResult (*p_xrDestroySceneObserverMSFT)(XrSceneObserverMSFT);
     XrResult (*p_xrDestroySession)(XrSession);
@@ -163,6 +212,9 @@ struct openxr_instance_funcs
     XrResult (*p_xrDestroySpatialGraphNodeBindingMSFT)(XrSpatialGraphNodeBindingMSFT);
     XrResult (*p_xrDestroySwapchain)(XrSwapchain);
     XrResult (*p_xrDestroyTriangleMeshFB)(XrTriangleMeshFB);
+    XrResult (*p_xrDestroyVirtualKeyboardMETA)(XrVirtualKeyboardMETA);
+    XrResult (*p_xrEnableLocalizationEventsML)(XrSession, const XrLocalizationEnableEventsInfoML *);
+    XrResult (*p_xrEnableUserCalibrationEventsML)(XrInstance, const XrUserCalibrationEnableEventsInfoML *);
     XrResult (*p_xrEndFrame)(XrSession, const XrFrameEndInfo *);
     XrResult (*p_xrEndSession)(XrSession);
     XrResult (*p_xrEnumerateApiLayerProperties)(uint32_t, uint32_t *, XrApiLayerProperties *);
@@ -170,6 +222,7 @@ struct openxr_instance_funcs
     XrResult (*p_xrEnumerateColorSpacesFB)(XrSession, uint32_t, uint32_t *, XrColorSpaceFB *);
     XrResult (*p_xrEnumerateDisplayRefreshRatesFB)(XrSession, uint32_t, uint32_t *, float *);
     XrResult (*p_xrEnumerateEnvironmentBlendModes)(XrInstance, XrSystemId, XrViewConfigurationType, uint32_t, uint32_t *, XrEnvironmentBlendMode *);
+    XrResult (*p_xrEnumerateEnvironmentDepthSwapchainImagesMETA)(XrEnvironmentDepthSwapchainMETA, uint32_t, uint32_t *, XrSwapchainImageBaseHeader *);
     XrResult (*p_xrEnumerateExternalCamerasOCULUS)(XrSession, uint32_t, uint32_t *, XrExternalCameraOCULUS *);
     XrResult (*p_xrEnumeratePerformanceMetricsCounterPathsMETA)(XrInstance, uint32_t, uint32_t *, XrPath *);
     XrResult (*p_xrEnumeratePersistedSpatialAnchorNamesMSFT)(XrSpatialAnchorStoreConnectionMSFT, uint32_t, uint32_t *, XrSpatialAnchorPersistenceNameMSFT *);
@@ -198,20 +251,40 @@ struct openxr_instance_funcs
     XrResult (*p_xrGetCurrentInteractionProfile)(XrSession, XrPath, XrInteractionProfileState *);
     XrResult (*p_xrGetDeviceSampleRateFB)(XrSession, const XrHapticActionInfo *, XrDevicePcmSampleRateGetInfoFB *);
     XrResult (*p_xrGetDisplayRefreshRateFB)(XrSession, float *);
+    XrResult (*p_xrGetEnvironmentDepthSwapchainStateMETA)(XrEnvironmentDepthSwapchainMETA, XrEnvironmentDepthSwapchainStateMETA *);
+    XrResult (*p_xrGetExportedLocalizationMapDataML)(XrExportedLocalizationMapML, uint32_t, uint32_t *, char *);
     XrResult (*p_xrGetEyeGazesFB)(XrEyeTrackerFB, const XrEyeGazesInfoFB *, XrEyeGazesFB *);
+    XrResult (*p_xrGetFaceExpressionWeights2FB)(XrFaceTracker2FB, const XrFaceExpressionInfo2FB *, XrFaceExpressionWeights2FB *);
     XrResult (*p_xrGetFaceExpressionWeightsFB)(XrFaceTrackerFB, const XrFaceExpressionInfoFB *, XrFaceExpressionWeightsFB *);
     XrResult (*p_xrGetFacialExpressionsHTC)(XrFacialTrackerHTC, XrFacialExpressionsHTC *);
     XrResult (*p_xrGetFoveationEyeTrackedStateMETA)(XrSession, XrFoveationEyeTrackedStateMETA *);
     XrResult (*p_xrGetHandMeshFB)(XrHandTrackerEXT, XrHandTrackingMeshFB *);
     XrResult (*p_xrGetInputSourceLocalizedName)(XrSession, const XrInputSourceLocalizedNameGetInfo *, uint32_t, uint32_t *, char *);
     XrResult (*p_xrGetInstanceProperties)(XrInstance, XrInstanceProperties *);
+    XrResult (*p_xrGetMarkerDetectorStateML)(XrMarkerDetectorML, XrMarkerDetectorStateML *);
+    XrResult (*p_xrGetMarkerLengthML)(XrMarkerDetectorML, XrMarkerML, float *);
+    XrResult (*p_xrGetMarkerNumberML)(XrMarkerDetectorML, XrMarkerML, uint64_t *);
+    XrResult (*p_xrGetMarkerReprojectionErrorML)(XrMarkerDetectorML, XrMarkerML, float *);
     XrResult (*p_xrGetMarkerSizeVARJO)(XrSession, uint64_t, XrExtent2Df *);
+    XrResult (*p_xrGetMarkerStringML)(XrMarkerDetectorML, XrMarkerML, uint32_t, uint32_t *, char *);
+    XrResult (*p_xrGetMarkersML)(XrMarkerDetectorML, uint32_t, uint32_t *, XrMarkerML *);
     XrResult (*p_xrGetOpenGLGraphicsRequirementsKHR)(XrInstance, XrSystemId, XrGraphicsRequirementsOpenGLKHR *);
+    XrResult (*p_xrGetPassthroughPreferencesMETA)(XrSession, XrPassthroughPreferencesMETA *);
     XrResult (*p_xrGetPerformanceMetricsStateMETA)(XrSession, XrPerformanceMetricsStateMETA *);
+    XrResult (*p_xrGetPlaneDetectionStateEXT)(XrPlaneDetectorEXT, XrPlaneDetectionStateEXT *);
+#if defined(USE_STRUCT_CONVERSION)
+    XrResult (*p_xrGetPlaneDetectionsEXT)(XrPlaneDetectorEXT, const XrPlaneDetectorGetInfoEXT *, XrPlaneDetectorLocationsEXT_host *);
+#else
+    XrResult (*p_xrGetPlaneDetectionsEXT)(XrPlaneDetectorEXT, const XrPlaneDetectorGetInfoEXT *, XrPlaneDetectorLocationsEXT *);
+#endif
+    XrResult (*p_xrGetPlanePolygonBufferEXT)(XrPlaneDetectorEXT, uint64_t, uint32_t, XrPlaneDetectorPolygonBufferEXT *);
+    XrResult (*p_xrGetRecommendedLayerResolutionMETA)(XrSession, const XrRecommendedLayerResolutionGetInfoMETA *, XrRecommendedLayerResolutionMETA *);
     XrResult (*p_xrGetReferenceSpaceBoundsRect)(XrSession, XrReferenceSpaceType, XrExtent2Df *);
     XrResult (*p_xrGetRenderModelPropertiesFB)(XrSession, XrPath, XrRenderModelPropertiesFB *);
     XrResult (*p_xrGetSceneComponentsMSFT)(XrSceneMSFT, const XrSceneComponentsGetInfoMSFT *, XrSceneComponentsMSFT *);
     XrResult (*p_xrGetSceneComputeStateMSFT)(XrSceneObserverMSFT, XrSceneComputeStateMSFT *);
+    XrResult (*p_xrGetSceneMarkerDecodedStringMSFT)(XrSceneMSFT, const XrUuidMSFT *, uint32_t, uint32_t *, char *);
+    XrResult (*p_xrGetSceneMarkerRawDataMSFT)(XrSceneMSFT, const XrUuidMSFT *, uint32_t, uint32_t *, uint8_t *);
 #if defined(USE_STRUCT_CONVERSION)
     XrResult (*p_xrGetSceneMeshBuffersMSFT)(XrSceneMSFT, const XrSceneMeshBuffersGetInfoMSFT_host *, XrSceneMeshBuffersMSFT *);
 #else
@@ -225,13 +298,19 @@ struct openxr_instance_funcs
     XrResult (*p_xrGetSpaceContainerFB)(XrSession, XrSpace, XrSpaceContainerFB *);
     XrResult (*p_xrGetSpaceRoomLayoutFB)(XrSession, XrSpace, XrRoomLayoutFB *);
     XrResult (*p_xrGetSpaceSemanticLabelsFB)(XrSession, XrSpace, XrSemanticLabelsFB *);
+    XrResult (*p_xrGetSpaceTriangleMeshMETA)(XrSpace, const XrSpaceTriangleMeshGetInfoMETA *, XrSpaceTriangleMeshMETA *);
     XrResult (*p_xrGetSpaceUserIdFB)(XrSpaceUserFB, XrSpaceUserIdFB *);
     XrResult (*p_xrGetSpaceUuidFB)(XrSpace, XrUuidEXT *);
+    XrResult (*p_xrGetSpatialAnchorNameHTC)(XrSpace, XrSpatialAnchorNameHTC *);
     XrResult (*p_xrGetSpatialGraphNodeBindingPropertiesMSFT)(XrSpatialGraphNodeBindingMSFT, const XrSpatialGraphNodeBindingPropertiesGetInfoMSFT *, XrSpatialGraphNodeBindingPropertiesMSFT *);
     XrResult (*p_xrGetSwapchainStateFB)(XrSwapchain, XrSwapchainStateBaseHeaderFB *);
     XrResult (*p_xrGetSystem)(XrInstance, const XrSystemGetInfo *, XrSystemId *);
     XrResult (*p_xrGetSystemProperties)(XrInstance, XrSystemId, XrSystemProperties *);
     XrResult (*p_xrGetViewConfigurationProperties)(XrInstance, XrSystemId, XrViewConfigurationType, XrViewConfigurationProperties *);
+    XrResult (*p_xrGetVirtualKeyboardDirtyTexturesMETA)(XrVirtualKeyboardMETA, uint32_t, uint32_t *, uint64_t *);
+    XrResult (*p_xrGetVirtualKeyboardModelAnimationStatesMETA)(XrVirtualKeyboardMETA, XrVirtualKeyboardModelAnimationStatesMETA *);
+    XrResult (*p_xrGetVirtualKeyboardScaleMETA)(XrVirtualKeyboardMETA, float *);
+    XrResult (*p_xrGetVirtualKeyboardTextureDataMETA)(XrVirtualKeyboardMETA, uint64_t, XrVirtualKeyboardTextureDataMETA *);
     XrResult (*p_xrGetVisibilityMaskKHR)(XrSession, XrViewConfigurationType, uint32_t, XrVisibilityMaskTypeKHR, XrVisibilityMaskKHR *);
     XrResult (*p_xrGetVulkanDeviceExtensionsKHR)(XrInstance, XrSystemId, uint32_t, uint32_t *, char *);
     XrResult (*p_xrGetVulkanGraphicsDevice2KHR)(XrInstance, const XrVulkanGraphicsDeviceGetInfoKHR *, VkPhysicalDevice *);
@@ -239,12 +318,15 @@ struct openxr_instance_funcs
     XrResult (*p_xrGetVulkanGraphicsRequirements2KHR)(XrInstance, XrSystemId, XrGraphicsRequirementsVulkanKHR *);
     XrResult (*p_xrGetVulkanGraphicsRequirementsKHR)(XrInstance, XrSystemId, XrGraphicsRequirementsVulkanKHR *);
     XrResult (*p_xrGetVulkanInstanceExtensionsKHR)(XrInstance, XrSystemId, uint32_t, uint32_t *, char *);
+    XrResult (*p_xrImportLocalizationMapML)(XrSession, const XrLocalizationMapImportInfoML *, XrUuidEXT *);
     XrResult (*p_xrLoadControllerModelMSFT)(XrSession, XrControllerModelKeyMSFT, uint32_t, uint32_t *, uint8_t *);
     XrResult (*p_xrLoadRenderModelFB)(XrSession, const XrRenderModelLoadInfoFB *, XrRenderModelBufferFB *);
     XrResult (*p_xrLocateBodyJointsFB)(XrBodyTrackerFB, const XrBodyJointsLocateInfoFB *, XrBodyJointLocationsFB *);
     XrResult (*p_xrLocateHandJointsEXT)(XrHandTrackerEXT, const XrHandJointsLocateInfoEXT *, XrHandJointLocationsEXT *);
     XrResult (*p_xrLocateSceneComponentsMSFT)(XrSceneMSFT, const XrSceneComponentsLocateInfoMSFT *, XrSceneComponentLocationsMSFT *);
     XrResult (*p_xrLocateSpace)(XrSpace, XrSpace, XrTime, XrSpaceLocation *);
+    XrResult (*p_xrLocateSpaces)(XrSession, const XrSpacesLocateInfo *, XrSpaceLocations *);
+    XrResult (*p_xrLocateSpacesKHR)(XrSession, const XrSpacesLocateInfo *, XrSpaceLocations *);
     XrResult (*p_xrLocateViews)(XrSession, const XrViewLocateInfo *, XrViewState *, uint32_t, uint32_t *, XrView *);
     XrResult (*p_xrPassthroughLayerPauseFB)(XrPassthroughLayerFB);
     XrResult (*p_xrPassthroughLayerResumeFB)(XrPassthroughLayerFB);
@@ -256,6 +338,8 @@ struct openxr_instance_funcs
     XrResult (*p_xrPerfSettingsSetPerformanceLevelEXT)(XrSession, XrPerfSettingsDomainEXT, XrPerfSettingsLevelEXT);
     XrResult (*p_xrPersistSpatialAnchorMSFT)(XrSpatialAnchorStoreConnectionMSFT, const XrSpatialAnchorPersistenceInfoMSFT *);
     XrResult (*p_xrPollEvent)(XrInstance, XrEventDataBuffer *);
+    XrResult (*p_xrPollFutureEXT)(XrInstance, const XrFuturePollInfoEXT *, XrFuturePollResultEXT *);
+    XrResult (*p_xrQueryLocalizationMapsML)(XrSession, const XrLocalizationMapQueryInfoBaseHeaderML *, uint32_t, uint32_t *, XrLocalizationMapML *);
     XrResult (*p_xrQueryPerformanceMetricsCounterMETA)(XrSession, XrPath, XrPerformanceMetricsCounterMETA *);
     XrResult (*p_xrQuerySpacesFB)(XrSession, const XrSpaceQueryInfoBaseHeaderFB *, XrAsyncRequestIdFB *);
 #if defined(USE_STRUCT_CONVERSION)
@@ -266,14 +350,17 @@ struct openxr_instance_funcs
     XrResult (*p_xrReleaseSwapchainImage)(XrSwapchain, const XrSwapchainImageReleaseInfo *);
     XrResult (*p_xrRequestDisplayRefreshRateFB)(XrSession, float);
     XrResult (*p_xrRequestExitSession)(XrSession);
+    XrResult (*p_xrRequestMapLocalizationML)(XrSession, const XrMapLocalizationRequestInfoML *);
     XrResult (*p_xrRequestSceneCaptureFB)(XrSession, const XrSceneCaptureRequestInfoFB *, XrAsyncRequestIdFB *);
     XrResult (*p_xrResultToString)(XrInstance, XrResult, char[]);
     XrResult (*p_xrRetrieveSpaceQueryResultsFB)(XrSession, XrAsyncRequestIdFB, XrSpaceQueryResultsFB *);
     XrResult (*p_xrSaveSpaceFB)(XrSession, const XrSpaceSaveInfoFB *, XrAsyncRequestIdFB *);
     XrResult (*p_xrSaveSpaceListFB)(XrSession, const XrSpaceListSaveInfoFB *, XrAsyncRequestIdFB *);
+    XrResult (*p_xrSendVirtualKeyboardInputMETA)(XrVirtualKeyboardMETA, const XrVirtualKeyboardInputInfoMETA *, XrPosef *);
     XrResult (*p_xrSetColorSpaceFB)(XrSession, const XrColorSpaceFB);
     XrResult (*p_xrSetDigitalLensControlALMALENCE)(XrSession, const XrDigitalLensControlALMALENCE *);
     XrResult (*p_xrSetEnvironmentDepthEstimationVARJO)(XrSession, XrBool32);
+    XrResult (*p_xrSetEnvironmentDepthHandRemovalMETA)(XrEnvironmentDepthProviderMETA, const XrEnvironmentDepthHandRemovalSetInfoMETA *);
     XrResult (*p_xrSetInputDeviceActiveEXT)(XrSession, XrPath, XrPath, XrBool32);
     XrResult (*p_xrSetInputDeviceLocationEXT)(XrSession, XrPath, XrPath, XrSpace, XrPosef);
     XrResult (*p_xrSetInputDeviceStateBoolEXT)(XrSession, XrPath, XrPath, XrBool32);
@@ -286,11 +373,16 @@ struct openxr_instance_funcs
     XrResult (*p_xrSetSpaceComponentStatusFB)(XrSpace, const XrSpaceComponentStatusSetInfoFB *, XrAsyncRequestIdFB *);
     XrResult (*p_xrSetTrackingOptimizationSettingsHintQCOM)(XrSession, XrTrackingOptimizationSettingsDomainQCOM, XrTrackingOptimizationSettingsHintQCOM);
     XrResult (*p_xrSetViewOffsetVARJO)(XrSession, float);
+    XrResult (*p_xrSetVirtualKeyboardModelVisibilityMETA)(XrVirtualKeyboardMETA, const XrVirtualKeyboardModelVisibilitySetInfoMETA *);
     XrResult (*p_xrShareSpacesFB)(XrSession, const XrSpaceShareInfoFB *, XrAsyncRequestIdFB *);
+    XrResult (*p_xrSnapshotMarkerDetectorML)(XrMarkerDetectorML, XrMarkerDetectorSnapshotInfoML *);
+    XrResult (*p_xrStartEnvironmentDepthProviderMETA)(XrEnvironmentDepthProviderMETA);
+    XrResult (*p_xrStopEnvironmentDepthProviderMETA)(XrEnvironmentDepthProviderMETA);
     XrResult (*p_xrStopHapticFeedback)(XrSession, const XrHapticActionInfo *);
     XrResult (*p_xrStringToPath)(XrInstance, const char *, XrPath *);
     XrResult (*p_xrStructureTypeToString)(XrInstance, XrStructureType, char[]);
     XrResult (*p_xrSuggestInteractionProfileBindings)(XrInstance, const XrInteractionProfileSuggestedBinding *);
+    XrResult (*p_xrSuggestVirtualKeyboardLocationMETA)(XrVirtualKeyboardMETA, const XrVirtualKeyboardLocationInfoMETA *);
     XrResult (*p_xrSyncActions)(XrSession, const XrActionsSyncInfo *);
     XrResult (*p_xrThermalGetTemperatureTrendEXT)(XrSession, XrPerfSettingsDomainEXT, XrPerfSettingsNotificationLevelEXT *, float *, float *);
     XrResult (*p_xrTriangleMeshBeginUpdateFB)(XrTriangleMeshFB);
@@ -302,26 +394,35 @@ struct openxr_instance_funcs
     XrResult (*p_xrTryCreateSpatialGraphStaticNodeBindingMSFT)(XrSession, const XrSpatialGraphStaticNodeBindingCreateInfoMSFT *, XrSpatialGraphNodeBindingMSFT *);
     XrResult (*p_xrUnpersistSpatialAnchorMSFT)(XrSpatialAnchorStoreConnectionMSFT, const XrSpatialAnchorPersistenceNameMSFT *);
     XrResult (*p_xrUpdateHandMeshMSFT)(XrHandTrackerEXT, const XrHandMeshUpdateInfoMSFT *, XrHandMeshMSFT *);
+    XrResult (*p_xrUpdatePassthroughColorLutMETA)(XrPassthroughColorLutMETA, const XrPassthroughColorLutUpdateInfoMETA *);
     XrResult (*p_xrUpdateSwapchainFB)(XrSwapchain, const XrSwapchainStateBaseHeaderFB *);
     XrResult (*p_xrWaitFrame)(XrSession, const XrFrameWaitInfo *, XrFrameState *);
     XrResult (*p_xrWaitSwapchainImage)(XrSwapchain, const XrSwapchainImageWaitInfo *);
 };
 
 #define ALL_XR_INSTANCE_FUNCS() \
+    USE_XR_FUNC(xrAcquireEnvironmentDepthImageMETA) \
     USE_XR_FUNC(xrAcquireSwapchainImage) \
     USE_XR_FUNC(xrApplyForceFeedbackCurlMNDX) \
     USE_XR_FUNC(xrApplyFoveationHTC) \
     USE_XR_FUNC(xrApplyHapticFeedback) \
     USE_XR_FUNC(xrAttachSessionActionSets) \
     USE_XR_FUNC(xrBeginFrame) \
+    USE_XR_FUNC(xrBeginPlaneDetectionEXT) \
     USE_XR_FUNC(xrBeginSession) \
+    USE_XR_FUNC(xrCancelFutureEXT) \
+    USE_XR_FUNC(xrChangeVirtualKeyboardTextContextMETA) \
     USE_XR_FUNC(xrClearSpatialAnchorStoreMSFT) \
     USE_XR_FUNC(xrComputeNewSceneMSFT) \
     USE_XR_FUNC(xrCreateAction) \
     USE_XR_FUNC(xrCreateActionSet) \
     USE_XR_FUNC(xrCreateActionSpace) \
     USE_XR_FUNC(xrCreateBodyTrackerFB) \
+    USE_XR_FUNC(xrCreateEnvironmentDepthProviderMETA) \
+    USE_XR_FUNC(xrCreateEnvironmentDepthSwapchainMETA) \
+    USE_XR_FUNC(xrCreateExportedLocalizationMapML) \
     USE_XR_FUNC(xrCreateEyeTrackerFB) \
+    USE_XR_FUNC(xrCreateFaceTracker2FB) \
     USE_XR_FUNC(xrCreateFaceTrackerFB) \
     USE_XR_FUNC(xrCreateFacialTrackerHTC) \
     USE_XR_FUNC(xrCreateFoveationProfileFB) \
@@ -329,10 +430,14 @@ struct openxr_instance_funcs
     USE_XR_FUNC(xrCreateHandMeshSpaceMSFT) \
     USE_XR_FUNC(xrCreateHandTrackerEXT) \
     USE_XR_FUNC(xrCreateKeyboardSpaceFB) \
+    USE_XR_FUNC(xrCreateMarkerDetectorML) \
+    USE_XR_FUNC(xrCreateMarkerSpaceML) \
     USE_XR_FUNC(xrCreateMarkerSpaceVARJO) \
+    USE_XR_FUNC(xrCreatePassthroughColorLutMETA) \
     USE_XR_FUNC(xrCreatePassthroughFB) \
     USE_XR_FUNC(xrCreatePassthroughHTC) \
     USE_XR_FUNC(xrCreatePassthroughLayerFB) \
+    USE_XR_FUNC(xrCreatePlaneDetectorEXT) \
     USE_XR_FUNC(xrCreateReferenceSpace) \
     USE_XR_FUNC(xrCreateSceneMSFT) \
     USE_XR_FUNC(xrCreateSceneObserverMSFT) \
@@ -340,27 +445,37 @@ struct openxr_instance_funcs
     USE_XR_FUNC(xrCreateSpaceUserFB) \
     USE_XR_FUNC(xrCreateSpatialAnchorFB) \
     USE_XR_FUNC(xrCreateSpatialAnchorFromPersistedNameMSFT) \
+    USE_XR_FUNC(xrCreateSpatialAnchorHTC) \
     USE_XR_FUNC(xrCreateSpatialAnchorMSFT) \
     USE_XR_FUNC(xrCreateSpatialAnchorSpaceMSFT) \
     USE_XR_FUNC(xrCreateSpatialAnchorStoreConnectionMSFT) \
     USE_XR_FUNC(xrCreateSpatialGraphNodeSpaceMSFT) \
     USE_XR_FUNC(xrCreateSwapchain) \
     USE_XR_FUNC(xrCreateTriangleMeshFB) \
+    USE_XR_FUNC(xrCreateVirtualKeyboardMETA) \
+    USE_XR_FUNC(xrCreateVirtualKeyboardSpaceMETA) \
     USE_XR_FUNC(xrCreateVulkanDeviceKHR) \
     USE_XR_FUNC(xrCreateVulkanInstanceKHR) \
     USE_XR_FUNC(xrDeserializeSceneMSFT) \
     USE_XR_FUNC(xrDestroyAction) \
     USE_XR_FUNC(xrDestroyActionSet) \
     USE_XR_FUNC(xrDestroyBodyTrackerFB) \
+    USE_XR_FUNC(xrDestroyEnvironmentDepthProviderMETA) \
+    USE_XR_FUNC(xrDestroyEnvironmentDepthSwapchainMETA) \
+    USE_XR_FUNC(xrDestroyExportedLocalizationMapML) \
     USE_XR_FUNC(xrDestroyEyeTrackerFB) \
+    USE_XR_FUNC(xrDestroyFaceTracker2FB) \
     USE_XR_FUNC(xrDestroyFaceTrackerFB) \
     USE_XR_FUNC(xrDestroyFacialTrackerHTC) \
     USE_XR_FUNC(xrDestroyFoveationProfileFB) \
     USE_XR_FUNC(xrDestroyGeometryInstanceFB) \
     USE_XR_FUNC(xrDestroyHandTrackerEXT) \
+    USE_XR_FUNC(xrDestroyMarkerDetectorML) \
+    USE_XR_FUNC(xrDestroyPassthroughColorLutMETA) \
     USE_XR_FUNC(xrDestroyPassthroughFB) \
     USE_XR_FUNC(xrDestroyPassthroughHTC) \
     USE_XR_FUNC(xrDestroyPassthroughLayerFB) \
+    USE_XR_FUNC(xrDestroyPlaneDetectorEXT) \
     USE_XR_FUNC(xrDestroySceneMSFT) \
     USE_XR_FUNC(xrDestroySceneObserverMSFT) \
     USE_XR_FUNC(xrDestroySession) \
@@ -371,6 +486,9 @@ struct openxr_instance_funcs
     USE_XR_FUNC(xrDestroySpatialGraphNodeBindingMSFT) \
     USE_XR_FUNC(xrDestroySwapchain) \
     USE_XR_FUNC(xrDestroyTriangleMeshFB) \
+    USE_XR_FUNC(xrDestroyVirtualKeyboardMETA) \
+    USE_XR_FUNC(xrEnableLocalizationEventsML) \
+    USE_XR_FUNC(xrEnableUserCalibrationEventsML) \
     USE_XR_FUNC(xrEndFrame) \
     USE_XR_FUNC(xrEndSession) \
     USE_XR_FUNC(xrEnumerateApiLayerProperties) \
@@ -378,6 +496,7 @@ struct openxr_instance_funcs
     USE_XR_FUNC(xrEnumerateColorSpacesFB) \
     USE_XR_FUNC(xrEnumerateDisplayRefreshRatesFB) \
     USE_XR_FUNC(xrEnumerateEnvironmentBlendModes) \
+    USE_XR_FUNC(xrEnumerateEnvironmentDepthSwapchainImagesMETA) \
     USE_XR_FUNC(xrEnumerateExternalCamerasOCULUS) \
     USE_XR_FUNC(xrEnumeratePerformanceMetricsCounterPathsMETA) \
     USE_XR_FUNC(xrEnumeratePersistedSpatialAnchorNamesMSFT) \
@@ -406,20 +525,36 @@ struct openxr_instance_funcs
     USE_XR_FUNC(xrGetCurrentInteractionProfile) \
     USE_XR_FUNC(xrGetDeviceSampleRateFB) \
     USE_XR_FUNC(xrGetDisplayRefreshRateFB) \
+    USE_XR_FUNC(xrGetEnvironmentDepthSwapchainStateMETA) \
+    USE_XR_FUNC(xrGetExportedLocalizationMapDataML) \
     USE_XR_FUNC(xrGetEyeGazesFB) \
+    USE_XR_FUNC(xrGetFaceExpressionWeights2FB) \
     USE_XR_FUNC(xrGetFaceExpressionWeightsFB) \
     USE_XR_FUNC(xrGetFacialExpressionsHTC) \
     USE_XR_FUNC(xrGetFoveationEyeTrackedStateMETA) \
     USE_XR_FUNC(xrGetHandMeshFB) \
     USE_XR_FUNC(xrGetInputSourceLocalizedName) \
     USE_XR_FUNC(xrGetInstanceProperties) \
+    USE_XR_FUNC(xrGetMarkerDetectorStateML) \
+    USE_XR_FUNC(xrGetMarkerLengthML) \
+    USE_XR_FUNC(xrGetMarkerNumberML) \
+    USE_XR_FUNC(xrGetMarkerReprojectionErrorML) \
     USE_XR_FUNC(xrGetMarkerSizeVARJO) \
+    USE_XR_FUNC(xrGetMarkerStringML) \
+    USE_XR_FUNC(xrGetMarkersML) \
     USE_XR_FUNC(xrGetOpenGLGraphicsRequirementsKHR) \
+    USE_XR_FUNC(xrGetPassthroughPreferencesMETA) \
     USE_XR_FUNC(xrGetPerformanceMetricsStateMETA) \
+    USE_XR_FUNC(xrGetPlaneDetectionStateEXT) \
+    USE_XR_FUNC(xrGetPlaneDetectionsEXT) \
+    USE_XR_FUNC(xrGetPlanePolygonBufferEXT) \
+    USE_XR_FUNC(xrGetRecommendedLayerResolutionMETA) \
     USE_XR_FUNC(xrGetReferenceSpaceBoundsRect) \
     USE_XR_FUNC(xrGetRenderModelPropertiesFB) \
     USE_XR_FUNC(xrGetSceneComponentsMSFT) \
     USE_XR_FUNC(xrGetSceneComputeStateMSFT) \
+    USE_XR_FUNC(xrGetSceneMarkerDecodedStringMSFT) \
+    USE_XR_FUNC(xrGetSceneMarkerRawDataMSFT) \
     USE_XR_FUNC(xrGetSceneMeshBuffersMSFT) \
     USE_XR_FUNC(xrGetSerializedSceneFragmentDataMSFT) \
     USE_XR_FUNC(xrGetSpaceBoundary2DFB) \
@@ -429,13 +564,19 @@ struct openxr_instance_funcs
     USE_XR_FUNC(xrGetSpaceContainerFB) \
     USE_XR_FUNC(xrGetSpaceRoomLayoutFB) \
     USE_XR_FUNC(xrGetSpaceSemanticLabelsFB) \
+    USE_XR_FUNC(xrGetSpaceTriangleMeshMETA) \
     USE_XR_FUNC(xrGetSpaceUserIdFB) \
     USE_XR_FUNC(xrGetSpaceUuidFB) \
+    USE_XR_FUNC(xrGetSpatialAnchorNameHTC) \
     USE_XR_FUNC(xrGetSpatialGraphNodeBindingPropertiesMSFT) \
     USE_XR_FUNC(xrGetSwapchainStateFB) \
     USE_XR_FUNC(xrGetSystem) \
     USE_XR_FUNC(xrGetSystemProperties) \
     USE_XR_FUNC(xrGetViewConfigurationProperties) \
+    USE_XR_FUNC(xrGetVirtualKeyboardDirtyTexturesMETA) \
+    USE_XR_FUNC(xrGetVirtualKeyboardModelAnimationStatesMETA) \
+    USE_XR_FUNC(xrGetVirtualKeyboardScaleMETA) \
+    USE_XR_FUNC(xrGetVirtualKeyboardTextureDataMETA) \
     USE_XR_FUNC(xrGetVisibilityMaskKHR) \
     USE_XR_FUNC(xrGetVulkanDeviceExtensionsKHR) \
     USE_XR_FUNC(xrGetVulkanGraphicsDevice2KHR) \
@@ -443,12 +584,15 @@ struct openxr_instance_funcs
     USE_XR_FUNC(xrGetVulkanGraphicsRequirements2KHR) \
     USE_XR_FUNC(xrGetVulkanGraphicsRequirementsKHR) \
     USE_XR_FUNC(xrGetVulkanInstanceExtensionsKHR) \
+    USE_XR_FUNC(xrImportLocalizationMapML) \
     USE_XR_FUNC(xrLoadControllerModelMSFT) \
     USE_XR_FUNC(xrLoadRenderModelFB) \
     USE_XR_FUNC(xrLocateBodyJointsFB) \
     USE_XR_FUNC(xrLocateHandJointsEXT) \
     USE_XR_FUNC(xrLocateSceneComponentsMSFT) \
     USE_XR_FUNC(xrLocateSpace) \
+    USE_XR_FUNC(xrLocateSpaces) \
+    USE_XR_FUNC(xrLocateSpacesKHR) \
     USE_XR_FUNC(xrLocateViews) \
     USE_XR_FUNC(xrPassthroughLayerPauseFB) \
     USE_XR_FUNC(xrPassthroughLayerResumeFB) \
@@ -460,20 +604,25 @@ struct openxr_instance_funcs
     USE_XR_FUNC(xrPerfSettingsSetPerformanceLevelEXT) \
     USE_XR_FUNC(xrPersistSpatialAnchorMSFT) \
     USE_XR_FUNC(xrPollEvent) \
+    USE_XR_FUNC(xrPollFutureEXT) \
+    USE_XR_FUNC(xrQueryLocalizationMapsML) \
     USE_XR_FUNC(xrQueryPerformanceMetricsCounterMETA) \
     USE_XR_FUNC(xrQuerySpacesFB) \
     USE_XR_FUNC(xrQuerySystemTrackedKeyboardFB) \
     USE_XR_FUNC(xrReleaseSwapchainImage) \
     USE_XR_FUNC(xrRequestDisplayRefreshRateFB) \
     USE_XR_FUNC(xrRequestExitSession) \
+    USE_XR_FUNC(xrRequestMapLocalizationML) \
     USE_XR_FUNC(xrRequestSceneCaptureFB) \
     USE_XR_FUNC(xrResultToString) \
     USE_XR_FUNC(xrRetrieveSpaceQueryResultsFB) \
     USE_XR_FUNC(xrSaveSpaceFB) \
     USE_XR_FUNC(xrSaveSpaceListFB) \
+    USE_XR_FUNC(xrSendVirtualKeyboardInputMETA) \
     USE_XR_FUNC(xrSetColorSpaceFB) \
     USE_XR_FUNC(xrSetDigitalLensControlALMALENCE) \
     USE_XR_FUNC(xrSetEnvironmentDepthEstimationVARJO) \
+    USE_XR_FUNC(xrSetEnvironmentDepthHandRemovalMETA) \
     USE_XR_FUNC(xrSetInputDeviceActiveEXT) \
     USE_XR_FUNC(xrSetInputDeviceLocationEXT) \
     USE_XR_FUNC(xrSetInputDeviceStateBoolEXT) \
@@ -486,11 +635,16 @@ struct openxr_instance_funcs
     USE_XR_FUNC(xrSetSpaceComponentStatusFB) \
     USE_XR_FUNC(xrSetTrackingOptimizationSettingsHintQCOM) \
     USE_XR_FUNC(xrSetViewOffsetVARJO) \
+    USE_XR_FUNC(xrSetVirtualKeyboardModelVisibilityMETA) \
     USE_XR_FUNC(xrShareSpacesFB) \
+    USE_XR_FUNC(xrSnapshotMarkerDetectorML) \
+    USE_XR_FUNC(xrStartEnvironmentDepthProviderMETA) \
+    USE_XR_FUNC(xrStopEnvironmentDepthProviderMETA) \
     USE_XR_FUNC(xrStopHapticFeedback) \
     USE_XR_FUNC(xrStringToPath) \
     USE_XR_FUNC(xrStructureTypeToString) \
     USE_XR_FUNC(xrSuggestInteractionProfileBindings) \
+    USE_XR_FUNC(xrSuggestVirtualKeyboardLocationMETA) \
     USE_XR_FUNC(xrSyncActions) \
     USE_XR_FUNC(xrThermalGetTemperatureTrendEXT) \
     USE_XR_FUNC(xrTriangleMeshBeginUpdateFB) \
@@ -502,6 +656,7 @@ struct openxr_instance_funcs
     USE_XR_FUNC(xrTryCreateSpatialGraphStaticNodeBindingMSFT) \
     USE_XR_FUNC(xrUnpersistSpatialAnchorMSFT) \
     USE_XR_FUNC(xrUpdateHandMeshMSFT) \
+    USE_XR_FUNC(xrUpdatePassthroughColorLutMETA) \
     USE_XR_FUNC(xrUpdateSwapchainFB) \
     USE_XR_FUNC(xrWaitFrame) \
     USE_XR_FUNC(xrWaitSwapchainImage)