Updated Vulkan-Headers and RTXMU.

CMakeLists.txt

@@ -55,10 +55,6 @@ endif()
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 if (NVRHI_WITH_VULKAN AND NOT TARGET Vulkan-Headers AND NOT TARGET Vulkan::Headers)
-    # Don't need the cpp module, disable it.
-    # TODO: Remove this after updating Vulkan-Headers to v1.3.301 or later, which have this option OFF by default.
-    option(VULKAN_HEADERS_ENABLE_MODULE "" OFF)
-
     add_subdirectory(thirdparty/Vulkan-Headers)
 endif()
 

src/vulkan/vulkan-device.cpp

@@ -36,7 +36,11 @@ namespace nvrhi::vulkan
     DeviceHandle createDevice(const DeviceDesc& desc)
     {
 #if defined(NVRHI_SHARED_LIBRARY_BUILD)
-        const vk::DynamicLoader dl;
+#if VK_HEADER_VERSION >= 301
+        vk::detail::DynamicLoader dl;
+#else
+        vk::DynamicLoader dl;
+#endif
         const PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr =   // NOLINT(misc-misplaced-const)
             dl.getProcAddress<PFN_vkGetInstanceProcAddr>("vkGetInstanceProcAddr");
         VULKAN_HPP_DEFAULT_DISPATCHER.init(desc.instance, vkGetInstanceProcAddr, desc.device);