Skip to content

Commit 787a254

Browse files
committed
make ggml_vk_default_dispatcher support older vulkan headers
1 parent a74a0d6 commit 787a254

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

ggml/src/ggml-vulkan/ggml-vulkan.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@
99
#define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1
1010
// We use VULKAN_HPP_DEFAULT_DISPATCHER, but not VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
1111
// to avoid conflicts with applications or other libraries who might use it.
12+
#if VK_HEADER_VERSION >= 301
1213
namespace vk::detail { class DispatchLoaderDynamic; }
1314
vk::detail::DispatchLoaderDynamic & ggml_vk_default_dispatcher();
15+
#else
16+
namespace vk { class DispatchLoaderDynamic; }
17+
vk::DispatchLoaderDynamic & ggml_vk_default_dispatcher();
18+
#endif
1419
#define VULKAN_HPP_DEFAULT_DISPATCHER ggml_vk_default_dispatcher()
1520

1621
#include <vulkan/vulkan.hpp>
@@ -4538,9 +4543,13 @@ static bool ggml_vk_instance_portability_enumeration_ext_available(const std::ve
45384543
static bool ggml_vk_instance_debug_utils_ext_available(const std::vector<vk::ExtensionProperties> & instance_extensions);
45394544
static bool ggml_vk_device_is_supported(const vk::PhysicalDevice & vkdev);
45404545

4546+
#if VK_HEADER_VERSION >= 301
45414547
static vk::detail::DispatchLoaderDynamic ggml_vk_default_dispatcher_instance;
4542-
45434548
vk::detail::DispatchLoaderDynamic & ggml_vk_default_dispatcher() {
4549+
#else
4550+
static vk::DispatchLoaderDynamic ggml_vk_default_dispatcher_instance;
4551+
vk::DispatchLoaderDynamic & ggml_vk_default_dispatcher() {
4552+
#endif
45444553
return ggml_vk_default_dispatcher_instance;
45454554
}
45464555

0 commit comments

Comments
 (0)