mirror of
https://github.com/ValveSoftware/Proton.git
synced 2024-12-26 14:45:48 +03:00
steam_helper: clean up OpenVR before getting OpenXR extensions in initialize_vr_data
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
This commit is contained in:
parent
6c7cba9aeb
commit
96bd85ccf4
@ -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")))
|
||||
{
|
||||
p__wineopenxr_get_extensions_internal = reinterpret_cast<decltype(p__wineopenxr_get_extensions_internal)>
|
||||
|
Loading…
Reference in New Issue
Block a user