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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 93217a4ad272f61162f25b71e1decf588796aef1
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=93217a4ad272f61162f25b71e...

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Fri Mar 11 15:56:45 2022 -0600

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=52640
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/adapter_vk.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index 506c7167f31..2752a0ac0b3 100644
--- 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;