From be90b5e9528e374e611f3225c6405d4cb8d731e1 Mon Sep 17 00:00:00 2001 From: Paul Gofman Date: Thu, 18 Apr 2024 13:52:45 -0600 Subject: [PATCH] wineopenxr: Handle XrPosef tracing. CW-Bug-Id: #23689 --- wineopenxr/make_openxr | 5 ++++- wineopenxr/openxr_thunks.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/wineopenxr/make_openxr b/wineopenxr/make_openxr index 1f83c0e0..01fc8564 100755 --- a/wineopenxr/make_openxr +++ b/wineopenxr/make_openxr @@ -1358,7 +1358,10 @@ class XrParam(object): elif self.type in ["XrVector2f"]: self.format_str = "%f, %f" self.format_conv = "{0}.x, {0}.y" - elif self.type in ["VisualID", "xcb_visualid_t", "VkInstance", "XrPosef"]: + elif self.type in ["XrPosef"]: + self.format_str = "{{%f, %f, %f, %f}, {%f %f %f}}" + self.format_conv = "{0}.orientation.x, {0}.orientation.y, {0}.orientation.z, {0}.orientation.w, {0}.position.x, {0}.position.y, {0}.position.z" + elif self.type in ["VisualID", "xcb_visualid_t", "VkInstance"]: # Don't care about Linux specific types. self.format_str = "" else: diff --git a/wineopenxr/openxr_thunks.c b/wineopenxr/openxr_thunks.c index 29cb7fca..eaae533c 100644 --- a/wineopenxr/openxr_thunks.c +++ b/wineopenxr/openxr_thunks.c @@ -648,7 +648,7 @@ static XrResult WINAPI wine_xrSetInputDeviceActiveEXT(XrSession session, XrPath static XrResult WINAPI wine_xrSetInputDeviceLocationEXT(XrSession session, XrPath topLevelPath, XrPath inputSourcePath, XrSpace space, XrPosef pose) { - WINE_TRACE("%p, 0x%s, 0x%s, %p, %p\n", session, wine_dbgstr_longlong(topLevelPath), wine_dbgstr_longlong(inputSourcePath), space, &pose); + WINE_TRACE("%p, 0x%s, 0x%s, %p, {{%f, %f, %f, %f}, {%f %f %f}}\n", session, wine_dbgstr_longlong(topLevelPath), wine_dbgstr_longlong(inputSourcePath), space, pose.orientation.x, pose.orientation.y, pose.orientation.z, pose.orientation.w, pose.position.x, pose.position.y, pose.position.z); return ((wine_XrSession *)session)->wine_instance->funcs.p_xrSetInputDeviceLocationEXT(((wine_XrSession *)session)->session, topLevelPath, inputSourcePath, space, pose); }