wineopenxr: Update to 1.1.36 registry version.

CW-Bug-Id: #23689

Author: Paul Gofman

OpenXR-SDK

@@ -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/make_openxr

@@ -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 @@ XrResult WINAPI wine_xrCreateInstance(const XrInstanceCreateInfo *createInfo, Xr
     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(
-        const XrNegotiateLoaderInfo_win *loaderInfo,
-        XrNegotiateRuntimeRequest_win *runtimeRequest)
+XrResult WINAPI wine_xrNegotiateLoaderRuntimeInterface(const XrNegotiateLoaderInfo *info, XrNegotiateRuntimeRequest *request)
 {
+    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: