Merged internal pull request !67 (Pass Vulkan library name for shared…

… library builds)
NVIDIA-RTX · Feb 19, 2025 · 7edaa4f · 7edaa4f
2 parents ae92adc + 71e9c13
commit 7edaa4f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/include/nvrhi/vulkan.h b/include/nvrhi/vulkan.h
@@ -78,6 +78,8 @@ namespace nvrhi::vulkan
         // Indicates if VkPhysicalDeviceVulkan12Features::bufferDeviceAddress was set to 'true' at device creation time
         bool bufferDeviceAddressSupported = false;
         bool aftermathEnabled = false;
+
+        std::string vulkanLibraryName; // if empty, use default
     };
 
     NVRHI_API DeviceHandle createDevice(const DeviceDesc& desc);

diff --git a/src/vulkan/vulkan-device.cpp b/src/vulkan/vulkan-device.cpp
@@ -37,9 +37,9 @@ namespace nvrhi::vulkan
     {
 #if defined(NVRHI_SHARED_LIBRARY_BUILD)
 #if VK_HEADER_VERSION >= 301
-        vk::detail::DynamicLoader dl;
+        vk::detail::DynamicLoader dl(desc.vulkanLibraryName);
 #else
-        vk::DynamicLoader dl;
+        vk::DynamicLoader dl(desc.vulkanLibraryName);
 #endif
         const PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr =   // NOLINT(misc-misplaced-const)
             dl.getProcAddress<PFN_vkGetInstanceProcAddr>("vkGetInstanceProcAddr");