Skip to content

Commit 132d673

Browse files
authored
vulkan: make ggml_vk_default_dispatcher support older vulkan headers (ggml-org#16345)
* make ggml_vk_default_dispatcher support older vulkan headers * simpilfy with using
1 parent aa9538a commit 132d673

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,14 @@
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; }
13-
vk::detail::DispatchLoaderDynamic & ggml_vk_default_dispatcher();
14+
using vk::detail::DispatchLoaderDynamic;
15+
#else
16+
namespace vk { class DispatchLoaderDynamic; }
17+
using vk::DispatchLoaderDynamic;
18+
#endif
19+
DispatchLoaderDynamic & ggml_vk_default_dispatcher();
1420
#define VULKAN_HPP_DEFAULT_DISPATCHER ggml_vk_default_dispatcher()
1521

1622
#include <vulkan/vulkan.hpp>
@@ -4538,9 +4544,8 @@ static bool ggml_vk_instance_portability_enumeration_ext_available(const std::ve
45384544
static bool ggml_vk_instance_debug_utils_ext_available(const std::vector<vk::ExtensionProperties> & instance_extensions);
45394545
static bool ggml_vk_device_is_supported(const vk::PhysicalDevice & vkdev);
45404546

4541-
static vk::detail::DispatchLoaderDynamic ggml_vk_default_dispatcher_instance;
4542-
4543-
vk::detail::DispatchLoaderDynamic & ggml_vk_default_dispatcher() {
4547+
static DispatchLoaderDynamic ggml_vk_default_dispatcher_instance;
4548+
DispatchLoaderDynamic & ggml_vk_default_dispatcher() {
45444549
return ggml_vk_default_dispatcher_instance;
45454550
}
45464551

0 commit comments

Comments
 (0)