Skip to content

Commit 07a61c5

Browse files
committed
Vulkan >=301 compat
1 parent 4868103 commit 07a61c5

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

src/video_display/vulkan/vulkan_context.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,11 @@ void VulkanInstance::init(std::vector<const char*>& required_extensions, bool en
328328
}
329329

330330
if (enable_validation) {
331+
#if VK_HEADER_VERSION >= 301
332+
dynamic_dispatcher = std::make_unique<vk::detail::DispatchLoaderDynamic>((VkInstance) instance, vkGetInstanceProcAddr);
333+
#else
331334
dynamic_dispatcher = std::make_unique<vk::DispatchLoaderDynamic>((VkInstance) instance, vkGetInstanceProcAddr);
335+
#endif
332336
init_validation_layers_error_messenger();
333337
}
334338
}

src/video_display/vulkan/vulkan_context.hpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,11 @@ struct SwapchainImage {
130130

131131
class VulkanContext {
132132
vk::Instance instance;
133+
#if VK_HEADER_VERSION >= 301
134+
std::unique_ptr<vk::detail::DispatchLoaderDynamic> dynamic_dispatcher{};
135+
#else
133136
std::unique_ptr<vk::DispatchLoaderDynamic> dynamic_dispatcher{};
137+
#endif
134138
vk::DebugUtilsMessengerEXT messenger;
135139
uint32_t vulkan_version{};
136140

@@ -221,7 +225,11 @@ inline void cout_msg([[maybe_unused]] LogLevel log_level, std::string_view msg)
221225

222226
class VulkanInstance {
223227
vk::Instance instance{};
228+
#if VK_HEADER_VERSION >= 301
229+
std::unique_ptr<vk::detail::DispatchLoaderDynamic> dynamic_dispatcher = nullptr;
230+
#else
224231
std::unique_ptr<vk::DispatchLoaderDynamic> dynamic_dispatcher = nullptr;
232+
#endif
225233
vk::DebugUtilsMessengerEXT messenger{};
226234
uint32_t vulkan_version = VK_API_VERSION_1_1;
227235

0 commit comments

Comments
 (0)