Vulkan >=301 compat

CESNET · Nov 12, 2024 · 2c070b9 · 2c070b9
1 parent eeeeae5
commit 2c070b9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/video_display/vulkan/vulkan_context.cpp b/src/video_display/vulkan/vulkan_context.cpp
@@ -328,7 +328,11 @@ void VulkanInstance::init(std::vector<const char*>& required_extensions, bool en
         }
 
         if (enable_validation) {
+#if VK_HEADER_VERSION >= 301
+                dynamic_dispatcher = std::make_unique<vk::detail::DispatchLoaderDynamic>((VkInstance) instance, vkGetInstanceProcAddr);
+#else
                 dynamic_dispatcher = std::make_unique<vk::DispatchLoaderDynamic>((VkInstance) instance, vkGetInstanceProcAddr);
+#endif
                 init_validation_layers_error_messenger();
         }
 }

diff --git a/src/video_display/vulkan/vulkan_context.hpp b/src/video_display/vulkan/vulkan_context.hpp
@@ -130,7 +130,11 @@ struct SwapchainImage {
 
 class VulkanContext {
         vk::Instance instance;
+#if VK_HEADER_VERSION >= 301
+        std::unique_ptr<vk::detail::DispatchLoaderDynamic> dynamic_dispatcher{};
+#else
         std::unique_ptr<vk::DispatchLoaderDynamic> dynamic_dispatcher{};
+#endif
         vk::DebugUtilsMessengerEXT messenger;
         uint32_t vulkan_version{};
 
@@ -221,7 +225,11 @@ inline void cout_msg([[maybe_unused]] LogLevel log_level, std::string_view msg)
 
 class VulkanInstance {
         vk::Instance instance{};
+#if VK_HEADER_VERSION >= 301
+        std::unique_ptr<vk::detail::DispatchLoaderDynamic> dynamic_dispatcher = nullptr;
+#else
         std::unique_ptr<vk::DispatchLoaderDynamic> dynamic_dispatcher = nullptr;
+#endif
         vk::DebugUtilsMessengerEXT messenger{};
         uint32_t vulkan_version = VK_API_VERSION_1_1;