Update Vulkan SDK to version 1.4.304 (#1281)

asuessenbach · web-flow · commit e17bf6efa966 · 2025-03-25T09:35:06.000-07:00
* Update Vulkan SDK to version 1.4.304

* Fix debug_utils_messenger_callback in hpp_hello_triangle.cpp
diff --git a/framework/core/hpp_instance.cpp b/framework/core/hpp_instance.cpp
@@ -35,35 +35,41 @@ 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,
-                                                              void                                       *user_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*/,
-                                                     uint64_t /*object*/, size_t /*location*/, int32_t /*message_code*/,
-                                                     const char *layer_prefix, const char *message, void * /*user_data*/)
+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
@@ -1026,9 +1026,9 @@ inline bool VulkanSample<bindingType>::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<PFN_vkGetInstanceProcAddr>("vkGetInstanceProcAddr"));
 
diff --git a/samples/api/hpp_hello_triangle/hpp_hello_triangle.cpp b/samples/api/hpp_hello_triangle/hpp_hello_triangle.cpp
@@ -30,16 +30,17 @@
 
 #if defined(VKB_DEBUG) || defined(VKB_VALIDATION_LAYERS)
 /// @brief A debug callback called from Vulkan validation layers.
-VKAPI_ATTR VkBool32 VKAPI_CALL debug_utils_messenger_callback(VkDebugUtilsMessageSeverityFlagBitsEXT message_severity, VkDebugUtilsMessageTypeFlagsEXT message_type,
-                                                              const VkDebugUtilsMessengerCallbackDataEXT *callback_data,
-                                                              void                                       *user_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);
 	}
@@ -382,9 +383,9 @@ vk::ImageView HPPHelloTriangle::create_image_view(vk::Image image)
 vk::Instance HPPHelloTriangle::create_instance(std::vector<const char *> const &required_instance_extensions, std::vector<const char *> 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<PFN_vkGetInstanceProcAddr>("vkGetInstanceProcAddr");
 	VULKAN_HPP_DEFAULT_DISPATCHER.init(vkGetInstanceProcAddr);
diff --git a/third_party/vulkan b/third_party/vulkan
@@ -1 +1 @@
-Subproject commit d91597a82f881d473887b560a03a7edf2720b72c
+Subproject commit d4a196d8c84e032d27f999adcea3075517c1c97f

Original file line number	Diff line number	Diff line change
`@@ -35,35 +35,41 @@ namespace vkb`
`35`	`35`	`namespace`
`36`	`36`	`{`
`37`	`37`	`#ifdef USE_VALIDATION_LAYERS`
`38`		`-VKAPI_ATTR VkBool32 VKAPI_CALL debug_utils_messenger_callback(VkDebugUtilsMessageSeverityFlagBitsEXT message_severity, VkDebugUtilsMessageTypeFlagsEXT message_type,`
`39`		`- const VkDebugUtilsMessengerCallbackDataEXT *callback_data,`
`40`		`- void *user_data)`
	`38`	`+VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_utils_messenger_callback(vk::DebugUtilsMessageSeverityFlagBitsEXT message_severity,`
	`39`	`+ vk::DebugUtilsMessageTypeFlagsEXT message_type,`
	`40`	`+ const vk::DebugUtilsMessengerCallbackDataEXT *callback_data,`
	`41`	`+ void *user_data)`
`41`	`42`	`{`
`42`	`43`	`// Log debug message`
`43`		`- if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)`
	`44`	`+ if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning)`
`44`	`45`	`{`
`45`	`46`	`LOGW("{} - {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);`
`46`	`47`	`}`
`47`		`- else if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)`
	`48`	`+ else if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eError)`
`48`	`49`	`{`
`49`	`50`	`LOGE("{} - {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);`
`50`	`51`	`}`
`51`	`52`	`return VK_FALSE;`
`52`	`53`	`}`
`53`	`54`
`54`		`-static VKAPI_ATTR VkBool32 VKAPI_CALL debug_callback(VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT /type/,`
`55`		`- uint64_t /object/, size_t /location/, int32_t /message_code/,`
`56`		`- const char layer_prefix, const char message, void * /user_data/)`
	`55`	`+static VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_callback(vk::DebugReportFlagsEXT flags,`
	`56`	`+ vk::DebugReportObjectTypeEXT /type/,`
	`57`	`+ uint64_t /object/,`
	`58`	`+ size_t /location/,`
	`59`	`+ int32_t /message_code/,`
	`60`	`+ const char *layer_prefix,`
	`61`	`+ const char *message,`
	`62`	`+ void * /user_data/)`
`57`	`63`	`{`
`58`		`- if (flags & VK_DEBUG_REPORT_ERROR_BIT_EXT)`
	`64`	`+ if (flags & vk::DebugReportFlagBitsEXT::eError)`
`59`	`65`	`{`
`60`	`66`	`LOGE("{}: {}", layer_prefix, message);`
`61`	`67`	`}`
`62`		`- else if (flags & VK_DEBUG_REPORT_WARNING_BIT_EXT)`
	`68`	`+ else if (flags & vk::DebugReportFlagBitsEXT::eWarning)`
`63`	`69`	`{`
`64`	`70`	`LOGW("{}: {}", layer_prefix, message);`
`65`	`71`	`}`
`66`		`- else if (flags & VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT)`
	`72`	`+ else if (flags & vk::DebugReportFlagBitsEXT::ePerformanceWarning)`
`67`	`73`	`{`
`68`	`74`	`LOGW("{}: {}", layer_prefix, message);`
`69`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,16 +30,17 @@`
`30`	`30`
`31`	`31`	`#if defined(VKB_DEBUG) \|\| defined(VKB_VALIDATION_LAYERS)`
`32`	`32`	`/// @brief A debug callback called from Vulkan validation layers.`
`33`		`-VKAPI_ATTR VkBool32 VKAPI_CALL debug_utils_messenger_callback(VkDebugUtilsMessageSeverityFlagBitsEXT message_severity, VkDebugUtilsMessageTypeFlagsEXT message_type,`
`34`		`- const VkDebugUtilsMessengerCallbackDataEXT *callback_data,`
`35`		`- void *user_data)`
	`33`	`+VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_utils_messenger_callback(vk::DebugUtilsMessageSeverityFlagBitsEXT message_severity,`
	`34`	`+ vk::DebugUtilsMessageTypeFlagsEXT message_type,`
	`35`	`+ const vk::DebugUtilsMessengerCallbackDataEXT *callback_data,`
	`36`	`+ void *user_data)`
`36`	`37`	`{`
`37`	`38`	`// Log debug message`
`38`		`- if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)`
	`39`	`+ if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning)`
`39`	`40`	`{`
`40`	`41`	`LOGW("{} - {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);`
`41`	`42`	`}`
`42`		`- else if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)`
	`43`	`+ else if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eError)`
`43`	`44`	`{`
`44`	`45`	`LOGE("{} - {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);`
`45`	`46`	`}`
`@@ -382,9 +383,9 @@ vk::ImageView HPPHelloTriangle::create_image_view(vk::Image image)`
`382`	`383`	`vk::Instance HPPHelloTriangle::create_instance(std::vector<const char > const &required_instance_extensions, std::vector<const char > const &required_validation_layers)`
`383`	`384`	`{`
`384`	`385`	`#if defined(_HPP_VULKAN_LIBRARY)`
`385`		`- static vk::DynamicLoader dl(_HPP_VULKAN_LIBRARY);`
	`386`	`+ static vk::detail::DynamicLoader dl(_HPP_VULKAN_LIBRARY);`
`386`	`387`	`#else`
`387`		`- static vk::DynamicLoader dl;`
	`388`	`+ static vk::detail::DynamicLoader dl;`
`388`	`389`	`#endif`
`389`	`390`	`PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr = dl.getProcAddress<PFN_vkGetInstanceProcAddr>("vkGetInstanceProcAddr");`
`390`	`391`	`VULKAN_HPP_DEFAULT_DISPATCHER.init(vkGetInstanceProcAddr);`