Skip to content

Commit

Permalink
Update Vulkan SDK to version 1.4.309
Browse files Browse the repository at this point in the history
  • Loading branch information
asuessenbach committed Feb 25, 2025
1 parent aaccd0c commit 38ac755
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 16 deletions.
28 changes: 17 additions & 11 deletions framework/core/hpp_instance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions framework/vulkan_sample.h
Original file line number Diff line number Diff line change
Expand Up @@ -1025,9 +1025,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"));

Expand Down
4 changes: 2 additions & 2 deletions samples/api/hpp_hello_triangle/hpp_hello_triangle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,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);
Expand Down

0 comments on commit 38ac755

Please sign in to comment.