wined3d: Try to load winevulkan.dll instead of vulkan-1.dll.

The Khronos Vulkan loader calls into dxgi, which results in infinite recursion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52640Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Try to load winevulkan.dll instead of vulkan-1.dll.
93217a4a · Zebediah Figura · Alexandre Julliard · 2fc3d7eb · 93217a4a
Commit 93217a4a authored Mar 11, 2022 by Zebediah Figura Committed by Alexandre Julliard Mar 14, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

adapter_vk.c dlls/wined3d/adapter_vk.c +2 -1

No files found.
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -219,7 +219,8 @@ static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info)
 {
    struct vulkan_ops *vk_ops = &vk_info->vk_ops;

-    if (!(vk_info->vulkan_lib = LoadLibraryA("vulkan-1.dll")))
+    if (!(vk_info->vulkan_lib = LoadLibraryA("winevulkan.dll"))
+            && !(vk_info->vulkan_lib = LoadLibraryA("vulkan-1.dll")))
    {
        WARN("Failed to load vulkan-1.dll.\n");
        return FALSE;