suyu/Yucom
25
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wineopenxr: Get required vulkan extensions from registry.

Browse source 
CW-Bug-ID: #19504
This commit is contained in:
Paul Gofman 2021-10-05 20:48:05 +03:00 committed by Arkadiusz Hiler
parent daf8263323
commit c218238762
1 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
wineopenxr/openxr.c
View file

@ -248,7 +248,7 @@ static void parse_extensions(const char *in, uint32_t *out_count,
*out_strs = list; *out_strs = list;
} }
static BOOL HACK_does_openvr_work(void) static BOOL get_vulkan_extensions(void)
{ {
/* Linux SteamVR's xrCreateInstance will hang forever if SteamVR hasn't /* Linux SteamVR's xrCreateInstance will hang forever if SteamVR hasn't
* already been launched by the user. Since that's the only way to tell if * already been launched by the user. Since that's the only way to tell if
@ -282,10 +282,7 @@ static BOOL HACK_does_openvr_work(void)
} }
if (value) if (value)
{ goto done;
RegCloseKey(vr_key);
return value == 1;
}
event = CreateEventA( NULL, FALSE, FALSE, NULL ); event = CreateEventA( NULL, FALSE, FALSE, NULL );
while (1) while (1)
@ -293,12 +290,14 @@ static BOOL HACK_does_openvr_work(void)
if (RegNotifyChangeKeyValue(vr_key, FALSE, REG_NOTIFY_CHANGE_LAST_SET, event, TRUE)) if (RegNotifyChangeKeyValue(vr_key, FALSE, REG_NOTIFY_CHANGE_LAST_SET, event, TRUE))
{ {
WINE_ERR("Error registering registry change notification.\n"); WINE_ERR("Error registering registry change notification.\n");
CloseHandle(event);
goto done; goto done;
} }
size = sizeof(value); size = sizeof(value);
if ((status = RegQueryValueExA(vr_key, "state", NULL, &type, (BYTE *)&value, &size))) if ((status = RegQueryValueExA(vr_key, "state", NULL, &type, (BYTE *)&value, &size)))
{ {
WINE_ERR("Could not query value, status %#x.\n", status); WINE_ERR("Could not query value, status %#x.\n", status);
CloseHandle(event);
goto done; goto done;
} }
if (value) if (value)
@ -312,9 +311,39 @@ static BOOL HACK_does_openvr_work(void)
break; break;
} }
} }
CloseHandle(event);
done: done:
CloseHandle(event); if (value == 1)
{
if ((status = RegQueryValueExA(vr_key, "openxr_vulkan_instance_extensions", NULL, &type, NULL, &size)))
{
WINE_ERR("Error getting openxr_vulkan_instance_extensions, status %#x.\n", wait_status);
RegCloseKey(vr_key);
return FALSE;
}
g_instance_extensions = heap_alloc(size);
if ((status = RegQueryValueExA(vr_key, "openxr_vulkan_instance_extensions", NULL, &type, g_instance_extensions, &size)))
{
WINE_ERR("Error getting openxr_vulkan_instance_extensions, status %#x.\n", wait_status);
RegCloseKey(vr_key);
return FALSE;
}
if ((status = RegQueryValueExA(vr_key, "openxr_vulkan_device_extensions", NULL, &type, NULL, &size)))
{
WINE_ERR("Error getting openxr_vulkan_device_extensions, status %#x.\n", wait_status);
RegCloseKey(vr_key);
return FALSE;
}
g_device_extensions = heap_alloc(size);
if ((status = RegQueryValueExA(vr_key, "openxr_vulkan_device_extensions", NULL, &type, g_device_extensions, &size)))
{
WINE_ERR("Error getting openxr_vulkan_device_extensions, status %#x.\n", wait_status);
RegCloseKey(vr_key);
return FALSE;
}
}
RegCloseKey(vr_key); RegCloseKey(vr_key);
return value == 1; return value == 1;
} }
@ -514,13 +543,13 @@ XrResult load_host_openxr_loader(void)
/* already done */ /* already done */
return XR_SUCCESS; return XR_SUCCESS;
if(!HACK_does_openvr_work()){ if(!get_vulkan_extensions()){
return XR_ERROR_INITIALIZATION_FAILED; return XR_ERROR_INITIALIZATION_FAILED;
} }
load_vk_unwrappers(); load_vk_unwrappers();
return __wineopenxr_get_extensions_internal(&g_instance_extensions, &g_device_extensions); return XR_SUCCESS;
} }
XrResult WINAPI wine_xrEnumerateInstanceExtensionProperties(const char *layerName, XrResult WINAPI wine_xrEnumerateInstanceExtensionProperties(const char *layerName,