Skip to content

Commit b8d9067

Browse files
committed
Update Vulkan SDK to version 1.4.304
1 parent aaccd0c commit b8d9067

File tree

4 files changed

+22
-16
lines changed

4 files changed

+22
-16
lines changed

framework/core/hpp_instance.cpp

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,35 +35,41 @@ namespace vkb
3535
namespace
3636
{
3737
#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)
4142
{
4243
// Log debug message
43-
if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)
44+
if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning)
4445
{
4546
LOGW("{} - {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
4647
}
47-
else if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)
48+
else if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eError)
4849
{
4950
LOGE("{} - {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
5051
}
5152
return VK_FALSE;
5253
}
5354

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*/)
5763
{
58-
if (flags & VK_DEBUG_REPORT_ERROR_BIT_EXT)
64+
if (flags & vk::DebugReportFlagBitsEXT::eError)
5965
{
6066
LOGE("{}: {}", layer_prefix, message);
6167
}
62-
else if (flags & VK_DEBUG_REPORT_WARNING_BIT_EXT)
68+
else if (flags & vk::DebugReportFlagBitsEXT::eWarning)
6369
{
6470
LOGW("{}: {}", layer_prefix, message);
6571
}
66-
else if (flags & VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT)
72+
else if (flags & vk::DebugReportFlagBitsEXT::ePerformanceWarning)
6773
{
6874
LOGW("{}: {}", layer_prefix, message);
6975
}

framework/vulkan_sample.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,9 +1025,9 @@ inline bool VulkanSample<bindingType>::prepare(const ApplicationOptions &options
10251025

10261026
// initialize C++-Bindings default dispatcher, first step
10271027
#if defined(_HPP_VULKAN_LIBRARY)
1028-
static vk::DynamicLoader dl(_HPP_VULKAN_LIBRARY);
1028+
static vk::detail::DynamicLoader dl(_HPP_VULKAN_LIBRARY);
10291029
#else
1030-
static vk::DynamicLoader dl;
1030+
static vk::detail::DynamicLoader dl;
10311031
#endif
10321032
VULKAN_HPP_DEFAULT_DISPATCHER.init(dl.getProcAddress<PFN_vkGetInstanceProcAddr>("vkGetInstanceProcAddr"));
10331033

samples/api/hpp_hello_triangle/hpp_hello_triangle.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,9 @@ vk::ImageView HPPHelloTriangle::create_image_view(vk::Image image)
370370
vk::Instance HPPHelloTriangle::create_instance(std::vector<const char *> const &required_instance_extensions, std::vector<const char *> const &required_validation_layers)
371371
{
372372
#if defined(_HPP_VULKAN_LIBRARY)
373-
static vk::DynamicLoader dl(_HPP_VULKAN_LIBRARY);
373+
static vk::detail::DynamicLoader dl(_HPP_VULKAN_LIBRARY);
374374
#else
375-
static vk::DynamicLoader dl;
375+
static vk::detail::DynamicLoader dl;
376376
#endif
377377
PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr = dl.getProcAddress<PFN_vkGetInstanceProcAddr>("vkGetInstanceProcAddr");
378378
VULKAN_HPP_DEFAULT_DISPATCHER.init(vkGetInstanceProcAddr);

0 commit comments

Comments
 (0)