From edfa604075f55464328fc167f6ab691e5e464ae4 Mon Sep 17 00:00:00 2001
From: Alexey Panteleev <alpanteleev@nvidia.com>
Date: Wed, 27 Nov 2024 08:19:02 -0800
Subject: [PATCH] Updated Vulkan-Headers and RTXMU.

---
 CMakeLists.txt               | 4 ----
 rtxmu                        | 2 +-
 src/vulkan/vulkan-device.cpp | 6 +++++-
 thirdparty/Vulkan-Headers    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 447aedc..d1e32a6 100644
--- a/CMakeLists.txt
+++ b/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()
 
diff --git a/rtxmu b/rtxmu
index 63d9fcf..0c9ce11 160000
--- a/rtxmu
+++ b/rtxmu
@@ -1 +1 @@
-Subproject commit 63d9fcf0d0eccc61f9a629780a46b150ccbbae1c
+Subproject commit 0c9ce1177000d5923e2cc6a35ae9cb7ff03748d2
diff --git a/src/vulkan/vulkan-device.cpp b/src/vulkan/vulkan-device.cpp
index 9bd600c..eb20188 100644
--- a/src/vulkan/vulkan-device.cpp
+++ b/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);
diff --git a/thirdparty/Vulkan-Headers b/thirdparty/Vulkan-Headers
index b955ae0..36872f9 160000
--- a/thirdparty/Vulkan-Headers
+++ b/thirdparty/Vulkan-Headers
@@ -1 +1 @@
-Subproject commit b955ae0edb4f02074bfbf134ccc1980e83122d30
+Subproject commit 36872f9062b17b1a30b8ed1d81ca5ea6bb608a72