Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-01-28 06:28:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

wineopenxr: HACK: Force enable XR_KHR_win32_convert_performance_counter_time.

Browse Source 
Linux SteamVR doesn't seem to support the Linux XR_KHR_convert_timespec_time
yet but the games start to refuse to work without the extension even if
they do not actually use it.

CW-Bug-Id: 19220
This commit is contained in:
Paul Gofman 2021-08-03 15:49:59 +03:00 committed by Andrew Eikum
parent 6981478bf5
commit 6471f83f55
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
wineopenxr/openxr.c
View File

@ -58,15 +58,16 @@ static void *heap_realloc(void *p, size_t s)
static const char WINE_VULKAN_DEVICE_EXTENSION_NAME[] = "VK_WINE_openxr_device_extensions"; static const char WINE_VULKAN_DEVICE_EXTENSION_NAME[] = "VK_WINE_openxr_device_extensions";
static const char WINE_VULKAN_DEVICE_VARIABLE[] = "__WINE_OPENXR_VK_DEVICE_EXTENSIONS"; static const char WINE_VULKAN_DEVICE_VARIABLE[] = "__WINE_OPENXR_VK_DEVICE_EXTENSIONS";
static const struct static struct
{ {
const char *win32_ext, *linux_ext; const char *win32_ext, *linux_ext;
BOOL remove_original; BOOL remove_original;
BOOL force_enable;
} }
substitute_extensions[] = substitute_extensions[] =
{ {
{"XR_KHR_D3D11_enable", "XR_KHR_vulkan_enable"}, {"XR_KHR_D3D11_enable", "XR_KHR_vulkan_enable"},
{"XR_KHR_win32_convert_performance_counter_time", "XR_KHR_convert_timespec_time", TRUE}, {"XR_KHR_win32_convert_performance_counter_time", "XR_KHR_convert_timespec_time", TRUE, TRUE},
}; };
static char *wineopenxr_strdup(const char *src) static char *wineopenxr_strdup(const char *src)
@ -535,7 +536,7 @@ XrResult WINAPI wine_xrEnumerateInstanceExtensionProperties(const char *layerNam
{ {
extra_extensions_count = 0; extra_extensions_count = 0;
for (i = 0; i < ARRAY_SIZE(substitute_extensions); ++i) for (i = 0; i < ARRAY_SIZE(substitute_extensions); ++i)
if (!substitute_extensions[i].remove_original) if (!substitute_extensions[i].remove_original || substitute_extensions[i].force_enable)
++extra_extensions_count; ++extra_extensions_count;
*propertyCountOutput += extra_extensions_count; *propertyCountOutput += extra_extensions_count;
@ -547,8 +548,16 @@ XrResult WINAPI wine_xrEnumerateInstanceExtensionProperties(const char *layerNam
for (i = 0; i < count; ++i) for (i = 0; i < count; ++i)
{ {
for (j = 0; j < ARRAY_SIZE(substitute_extensions); ++j) for (j = 0; j < ARRAY_SIZE(substitute_extensions); ++j)
{
if (!strcmp(properties[i].extensionName, substitute_extensions[j].linux_ext)) if (!strcmp(properties[i].extensionName, substitute_extensions[j].linux_ext))
{ {
if (substitute_extensions[j].force_enable)
{
WINE_FIXME("Force enabled extension %s already supported by the runtime.\n",
substitute_extensions[j].linux_ext);
substitute_extensions[j].force_enable = FALSE;
}
if (substitute_extensions[j].remove_original) if (substitute_extensions[j].remove_original)
dst = i; dst = i;
else else
@ -556,8 +565,17 @@ XrResult WINAPI wine_xrEnumerateInstanceExtensionProperties(const char *layerNam
strcpy(properties[dst].extensionName, substitute_extensions[j].win32_ext); strcpy(properties[dst].extensionName, substitute_extensions[j].win32_ext);
break; break;
} }
}
} }
for (j = 0; j < ARRAY_SIZE(substitute_extensions); ++j)
if (substitute_extensions[j].force_enable)
{
strcpy(properties[*propertyCountOutput].extensionName, substitute_extensions[j].win32_ext);
++*propertyCountOutput;
}
WINE_TRACE("Enumerated extensions:\n"); WINE_TRACE("Enumerated extensions:\n");
for(i = 0; i < *propertyCountOutput; ++i) for(i = 0; i < *propertyCountOutput; ++i)
WINE_TRACE(" -%s\n", properties[i].extensionName); WINE_TRACE(" -%s\n", properties[i].extensionName);
@ -674,7 +692,7 @@ XrResult WINAPI wine_xrCreateInstance(const XrInstanceCreateInfo *createInfo, Xr
{ {
XrResult res; XrResult res;
struct wine_XrInstance *wine_instance; struct wine_XrInstance *wine_instance;
uint32_t i, j, type = 0; uint32_t i, j, count, type = 0;
XrInstanceCreateInfo our_createInfo; XrInstanceCreateInfo our_createInfo;
const char *ext_name; const char *ext_name;
char **new_list; char **new_list;
@ -697,6 +715,7 @@ XrResult WINAPI wine_xrCreateInstance(const XrInstanceCreateInfo *createInfo, Xr
new_list = heap_alloc(createInfo->enabledExtensionCount * sizeof(*new_list)); new_list = heap_alloc(createInfo->enabledExtensionCount * sizeof(*new_list));
count = 0;
/* remove win32 extensions */ /* remove win32 extensions */
for(i = 0; i < createInfo->enabledExtensionCount; ++i) for(i = 0; i < createInfo->enabledExtensionCount; ++i)
{ {
@ -705,16 +724,20 @@ XrResult WINAPI wine_xrCreateInstance(const XrInstanceCreateInfo *createInfo, Xr
{ {
if (!strcmp(ext_name, substitute_extensions[j].win32_ext)) if (!strcmp(ext_name, substitute_extensions[j].win32_ext))
{ {
ext_name = substitute_extensions[j].linux_ext; if (substitute_extensions[j].force_enable)
ext_name = NULL;
else
ext_name = substitute_extensions[j].linux_ext;
break; break;
} }
} }
new_list[i] = wineopenxr_strdup(ext_name); if (ext_name)
new_list[count++] = wineopenxr_strdup(ext_name);
} }
our_createInfo = *createInfo; our_createInfo = *createInfo;
our_createInfo.enabledExtensionNames = (const char * const*)new_list; our_createInfo.enabledExtensionNames = (const char * const*)new_list;
our_createInfo.enabledExtensionCount = createInfo->enabledExtensionCount; our_createInfo.enabledExtensionCount = count;
createInfo = &our_createInfo; createInfo = &our_createInfo;
WINE_TRACE("Enabled extensions:\n"); WINE_TRACE("Enabled extensions:\n");