|
@@ -9,8 +9,14 @@
|
|
|
#define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1
|
|
#define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1
|
|
|
// We use VULKAN_HPP_DEFAULT_DISPATCHER, but not VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
|
|
// We use VULKAN_HPP_DEFAULT_DISPATCHER, but not VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
|
|
|
// to avoid conflicts with applications or other libraries who might use it.
|
|
// to avoid conflicts with applications or other libraries who might use it.
|
|
|
|
|
+#if VK_HEADER_VERSION >= 301
|
|
|
namespace vk::detail { class DispatchLoaderDynamic; }
|
|
namespace vk::detail { class DispatchLoaderDynamic; }
|
|
|
-vk::detail::DispatchLoaderDynamic & ggml_vk_default_dispatcher();
|
|
|
|
|
|
|
+using vk::detail::DispatchLoaderDynamic;
|
|
|
|
|
+#else
|
|
|
|
|
+namespace vk { class DispatchLoaderDynamic; }
|
|
|
|
|
+using vk::DispatchLoaderDynamic;
|
|
|
|
|
+#endif
|
|
|
|
|
+DispatchLoaderDynamic & ggml_vk_default_dispatcher();
|
|
|
#define VULKAN_HPP_DEFAULT_DISPATCHER ggml_vk_default_dispatcher()
|
|
#define VULKAN_HPP_DEFAULT_DISPATCHER ggml_vk_default_dispatcher()
|
|
|
|
|
|
|
|
#include <vulkan/vulkan.hpp>
|
|
#include <vulkan/vulkan.hpp>
|
|
@@ -4538,9 +4544,8 @@ static bool ggml_vk_instance_portability_enumeration_ext_available(const std::ve
|
|
|
static bool ggml_vk_instance_debug_utils_ext_available(const std::vector<vk::ExtensionProperties> & instance_extensions);
|
|
static bool ggml_vk_instance_debug_utils_ext_available(const std::vector<vk::ExtensionProperties> & instance_extensions);
|
|
|
static bool ggml_vk_device_is_supported(const vk::PhysicalDevice & vkdev);
|
|
static bool ggml_vk_device_is_supported(const vk::PhysicalDevice & vkdev);
|
|
|
|
|
|
|
|
-static vk::detail::DispatchLoaderDynamic ggml_vk_default_dispatcher_instance;
|
|
|
|
|
-
|
|
|
|
|
-vk::detail::DispatchLoaderDynamic & ggml_vk_default_dispatcher() {
|
|
|
|
|
|
|
+static DispatchLoaderDynamic ggml_vk_default_dispatcher_instance;
|
|
|
|
|
+DispatchLoaderDynamic & ggml_vk_default_dispatcher() {
|
|
|
return ggml_vk_default_dispatcher_instance;
|
|
return ggml_vk_default_dispatcher_instance;
|
|
|
}
|
|
}
|
|
|
|
|
|