From 217b0e1aa7e9a67a811385c2718fd46614577082 Mon Sep 17 00:00:00 2001 From: asuessenbach Date: Tue, 25 Feb 2025 11:19:49 +0100 Subject: [PATCH] Update Vulkan SDK to version 1.4.309 --- framework/core/hpp_instance.cpp | 16 ++++++++-------- framework/vulkan_sample.h | 4 ++-- .../hpp_hello_triangle/hpp_hello_triangle.cpp | 4 ++-- third_party/vulkan | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/framework/core/hpp_instance.cpp b/framework/core/hpp_instance.cpp index 2c5435b7b..0100d5a0a 100644 --- a/framework/core/hpp_instance.cpp +++ b/framework/core/hpp_instance.cpp @@ -35,35 +35,35 @@ namespace vkb namespace { #ifdef USE_VALIDATION_LAYERS -VKAPI_ATTR VkBool32 VKAPI_CALL debug_utils_messenger_callback(VkDebugUtilsMessageSeverityFlagBitsEXT message_severity, VkDebugUtilsMessageTypeFlagsEXT message_type, - const VkDebugUtilsMessengerCallbackDataEXT *callback_data, +VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_utils_messenger_callback(vk::DebugUtilsMessageSeverityFlagBitsEXT message_severity, vk::DebugUtilsMessageTypeFlagsEXT message_type, + const vk::DebugUtilsMessengerCallbackDataEXT *callback_data, void *user_data) { // Log debug message - if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) + if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning) { LOGW("{} - {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage); } - else if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) + else if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eError) { LOGE("{} - {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage); } return VK_FALSE; } -static VKAPI_ATTR VkBool32 VKAPI_CALL debug_callback(VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT /*type*/, +static VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_callback(vk::DebugReportFlagsEXT flags, vk::DebugReportObjectTypeEXT /*type*/, uint64_t /*object*/, size_t /*location*/, int32_t /*message_code*/, const char *layer_prefix, const char *message, void * /*user_data*/) { - if (flags & VK_DEBUG_REPORT_ERROR_BIT_EXT) + if (flags & vk::DebugReportFlagBitsEXT::eError) { LOGE("{}: {}", layer_prefix, message); } - else if (flags & VK_DEBUG_REPORT_WARNING_BIT_EXT) + else if (flags & vk::DebugReportFlagBitsEXT::eWarning) { LOGW("{}: {}", layer_prefix, message); } - else if (flags & VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT) + else if (flags & vk::DebugReportFlagBitsEXT::ePerformanceWarning) { LOGW("{}: {}", layer_prefix, message); } diff --git a/framework/vulkan_sample.h b/framework/vulkan_sample.h index 006b5c168..dc4853713 100644 --- a/framework/vulkan_sample.h +++ b/framework/vulkan_sample.h @@ -1025,9 +1025,9 @@ inline bool VulkanSample::prepare(const ApplicationOptions &options // initialize C++-Bindings default dispatcher, first step #if defined(_HPP_VULKAN_LIBRARY) - static vk::DynamicLoader dl(_HPP_VULKAN_LIBRARY); + static vk::detail::DynamicLoader dl(_HPP_VULKAN_LIBRARY); #else - static vk::DynamicLoader dl; + static vk::detail::DynamicLoader dl; #endif VULKAN_HPP_DEFAULT_DISPATCHER.init(dl.getProcAddress("vkGetInstanceProcAddr")); diff --git a/samples/api/hpp_hello_triangle/hpp_hello_triangle.cpp b/samples/api/hpp_hello_triangle/hpp_hello_triangle.cpp index 57b208e4e..2553e0f3b 100644 --- a/samples/api/hpp_hello_triangle/hpp_hello_triangle.cpp +++ b/samples/api/hpp_hello_triangle/hpp_hello_triangle.cpp @@ -370,9 +370,9 @@ vk::ImageView HPPHelloTriangle::create_image_view(vk::Image image) vk::Instance HPPHelloTriangle::create_instance(std::vector const &required_instance_extensions, std::vector const &required_validation_layers) { #if defined(_HPP_VULKAN_LIBRARY) - static vk::DynamicLoader dl(_HPP_VULKAN_LIBRARY); + static vk::detail::DynamicLoader dl(_HPP_VULKAN_LIBRARY); #else - static vk::DynamicLoader dl; + static vk::detail::DynamicLoader dl; #endif PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr = dl.getProcAddress("vkGetInstanceProcAddr"); VULKAN_HPP_DEFAULT_DISPATCHER.init(vkGetInstanceProcAddr); diff --git a/third_party/vulkan b/third_party/vulkan index d91597a82..d4a196d8c 160000 --- a/third_party/vulkan +++ b/third_party/vulkan @@ -1 +1 @@ -Subproject commit d91597a82f881d473887b560a03a7edf2720b72c +Subproject commit d4a196d8c84e032d27f999adcea3075517c1c97f