From 36f523bbf5cf5308ea4b18af3a5dc1c646d9e415 Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Thu, 1 Sep 2022 02:16:56 +0000 Subject: [PATCH] [vulkan] Fix loading libvulkan natively --- src/vulkan/vulkan_loader.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/vulkan/vulkan_loader.cpp b/src/vulkan/vulkan_loader.cpp index c2b419e0e..b435b22ae 100644 --- a/src/vulkan/vulkan_loader.cpp +++ b/src/vulkan/vulkan_loader.cpp @@ -4,8 +4,19 @@ namespace dxvk::vk { + static HMODULE loadVulkanLibrary() { +#ifdef _WIN32 + return LoadLibraryA("vulkan-1.dll"); +#else + HMODULE library = LoadLibraryA("libvulkan.so"); + if (!library) + library = LoadLibraryA("libvulkan.so.1"); + return library; +#endif + } + LibraryLoader::LibraryLoader() - : m_library(LoadLibraryA("vulkan-1")) + : m_library(loadVulkanLibrary()) , m_getInstanceProcAddr(reinterpret_cast( GetProcAddress(m_library, "vkGetInstanceProcAddr"))) { }