Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-27 07:05:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

steam_helper: clean up OpenVR before getting OpenXR extensions in initialize_vr_data

Browse Source 
Patch written by Emily <102429049+emily-is-my-username@users.noreply.github.com>

https://github.com/ValveSoftware/Proton/pull/8126

When using OpenComposite, both OpenVR and OpenXR functions may
call the same underlying OpenXR loader.

Because the OpenXR loader only supports a single active instance,
`initialize_vr_data` currently fails as an OpenXR instance
has already been initialized ath the time XR extensions are queried.

This commit fixes the problem by cleaning up the temporary
OpenVR context *before* initializing OpenXR instead of keeping it
open until the end of the call.

Fix for:
https://github.com/ValveSoftware/Proton/issues/7905

Signed-off-by: Paul Gofman <pgofman@codeweavers.com>
This commit is contained in:
Paul Gofman 2024-09-29 02:25:22 +02:00
parent 9ef062cef7
commit 5b26b6a1d4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
steam_helper/steam.cpp
View File

@ -893,6 +893,11 @@ static DWORD WINAPI initialize_vr_data(void *arg)
} }
} }
if (vr_initialized) {
client_core->Cleanup();
vr_initialized = FALSE;
}
if ((hwineopenxr = LoadLibraryA("wineopenxr.dll"))) if ((hwineopenxr = LoadLibraryA("wineopenxr.dll")))
{ {
p__wineopenxr_get_extensions_internal = reinterpret_cast<decltype(p__wineopenxr_get_extensions_internal)> p__wineopenxr_get_extensions_internal = reinterpret_cast<decltype(p__wineopenxr_get_extensions_internal)>