Skip to content

Commit e6497ea

Browse files
asuessenbachasuessenbach
committed
Align all general DebugUtilsMessengerCallbacks as in hpp_hello_triangle.
1 parent ad5dd38 commit e6497ea

6 files changed

Lines changed: 110 additions & 84 deletions

File tree

‎framework/core/hpp_debug.h‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,15 +155,26 @@ inline VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_utils_messenger_callback(vk::Debug
155155
void *user_data)
156156
{
157157
// Log debug message
158-
if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning)
158+
std::string message = fmt::format("Debug callback {}\n{}: {}", vk::to_string(message_type), callback_data->pMessageIdName, callback_data->pMessage);
159+
switch (message_severity)
159160
{
160-
LOGW("{} - {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
161+
case vk::DebugUtilsMessageSeverityFlagBitsEXT::eVerbose:
162+
LOGD("{}", message);
163+
break;
164+
case vk::DebugUtilsMessageSeverityFlagBitsEXT::eInfo:
165+
LOGI("{}", message);
166+
break;
167+
case vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning:
168+
LOGW("{}", message);
169+
break;
170+
case vk::DebugUtilsMessageSeverityFlagBitsEXT::eError:
171+
LOGE("{}", message);
172+
break;
173+
default:
174+
LOGE("Unknown message severity {}!\n{}", vk::to_string(message_severity), message);
175+
break;
161176
}
162-
else if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eError)
163-
{
164-
LOGE("{} - {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
165-
}
166-
return false;
177+
return vk::False;
167178
}
168179

169180
inline VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_callback(vk::DebugReportFlagsEXT flags,

‎samples/api/hello_triangle/hello_triangle.cpp‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,33 @@
2525

2626
#if defined(VKB_DEBUG) || defined(VKB_VALIDATION_LAYERS)
2727
/// @brief A debug callback used to report messages from the validation layers. See instance creation for details on how this is set up
28-
static VKAPI_ATTR VkBool32 VKAPI_CALL debug_callback(VkDebugUtilsMessageSeverityFlagBitsEXT message_severity, VkDebugUtilsMessageTypeFlagsEXT message_type,
28+
static VKAPI_ATTR VkBool32 VKAPI_CALL debug_callback(VkDebugUtilsMessageSeverityFlagBitsEXT message_severity,
29+
VkDebugUtilsMessageTypeFlagsEXT message_type,
2930
const VkDebugUtilsMessengerCallbackDataEXT *callback_data,
3031
void *user_data)
3132
{
32-
(void) user_data;
33-
34-
if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)
35-
{
36-
LOGE("{} Validation Layer: Error: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage)
37-
}
38-
else if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)
39-
{
40-
LOGE("{} Validation Layer: Warning: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage)
41-
}
42-
else if (message_type & VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT)
43-
{
44-
LOGI("{} Validation Layer: Performance warning: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage)
45-
}
46-
else
47-
{
48-
LOGI("{} Validation Layer: Information: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage)
33+
// Log debug message
34+
std::string message = fmt::format("Debug callback {}\n{}: {}",
35+
vk::to_string(static_cast<vk::DebugUtilsMessageTypeFlagsEXT>(message_type)),
36+
callback_data->pMessageIdName,
37+
callback_data->pMessage);
38+
switch (message_severity)
39+
{
40+
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT:
41+
LOGD("{}", message);
42+
break;
43+
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT:
44+
LOGI("{}", message);
45+
break;
46+
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT:
47+
LOGW("{}", message);
48+
break;
49+
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT:
50+
LOGE("{}", message);
51+
break;
52+
default:
53+
LOGE("Unknown message severity {}!\n{}", vk::to_string(static_cast<vk::DebugUtilsMessageSeverityFlagBitsEXT>(message_severity)), message);
54+
break;
4955
}
5056
return VK_FALSE;
5157
}

‎samples/api/hello_triangle_1_3/hello_triangle_1_3.cpp‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,32 @@
2525
#if defined(VKB_DEBUG) || defined(VKB_VALIDATION_LAYERS)
2626
/// @brief A debug callback called from Vulkan validation layers.
2727
static VKAPI_ATTR VkBool32 VKAPI_CALL debug_callback(VkDebugUtilsMessageSeverityFlagBitsEXT message_severity,
28-
VkDebugUtilsMessageTypeFlagsEXT message_types,
28+
VkDebugUtilsMessageTypeFlagsEXT message_type,
2929
const VkDebugUtilsMessengerCallbackDataEXT *callback_data,
3030
void *user_data)
3131
{
32-
if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)
33-
{
34-
LOGE("{} Validation Layer: Error: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
35-
}
36-
else if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)
37-
{
38-
LOGW("{} Validation Layer: Warning: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
39-
}
40-
else if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT)
41-
{
42-
LOGI("{} Validation Layer: Information: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
43-
}
44-
else if (message_types & VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT)
45-
{
46-
LOGI("{} Validation Layer: Performance warning: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
47-
}
48-
else if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT)
49-
{
50-
LOGD("{} Validation Layer: Verbose: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
32+
// Log debug message
33+
std::string message = fmt::format("Debug callback {}\n{}: {}",
34+
vk::to_string(static_cast<vk::DebugUtilsMessageTypeFlagsEXT>(message_type)),
35+
callback_data->pMessageIdName,
36+
callback_data->pMessage);
37+
switch (message_severity)
38+
{
39+
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT:
40+
LOGD("{}", message);
41+
break;
42+
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT:
43+
LOGI("{}", message);
44+
break;
45+
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT:
46+
LOGW("{}", message);
47+
break;
48+
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT:
49+
LOGE("{}", message);
50+
break;
51+
default:
52+
LOGE("Unknown message severity {}!\n{}", vk::to_string(static_cast<vk::DebugUtilsMessageSeverityFlagBitsEXT>(message_severity)), message);
53+
break;
5154
}
5255
return VK_FALSE;
5356
}

‎samples/api/hpp_hello_triangle/hpp_hello_triangle.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_utils_messenger_callback(vk::DebugUtilsMe
3535
void *user_data)
3636
{
3737
// Log debug message
38-
std::string message = std::format("Debug callback {}\n{}: {}", vk::to_string(message_type), callback_data->pMessageIdName, callback_data->pMessage);
38+
std::string message = fmt::format("Debug callback {}\n{}: {}", vk::to_string(message_type), callback_data->pMessageIdName, callback_data->pMessage);
3939
switch (message_severity)
4040
{
4141
case vk::DebugUtilsMessageSeverityFlagBitsEXT::eVerbose:
@@ -54,7 +54,7 @@ VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_utils_messenger_callback(vk::DebugUtilsMe
5454
LOGE("Unknown message severity {}!\n{}", vk::to_string(message_severity), message);
5555
break;
5656
}
57-
return VK_FALSE;
57+
return vk::False;
5858
}
5959
#endif
6060

‎samples/api/hpp_hello_triangle_1_3/hpp_hello_triangle_1_3.cpp‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,31 @@
2424
#if defined(VKB_DEBUG) || defined(VKB_VALIDATION_LAYERS)
2525
/// @brief A debug callback called from Vulkan validation layers.
2626
static VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_callback(vk::DebugUtilsMessageSeverityFlagBitsEXT message_severity,
27-
vk::DebugUtilsMessageTypeFlagsEXT message_types,
27+
vk::DebugUtilsMessageTypeFlagsEXT message_type,
2828
vk::DebugUtilsMessengerCallbackDataEXT const *callback_data,
2929
void *user_data)
3030
{
31-
if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eError)
31+
// Log debug message
32+
std::string message = fmt::format("Debug callback {}\n{}: {}", vk::to_string(message_type), callback_data->pMessageIdName, callback_data->pMessage);
33+
switch (message_severity)
3234
{
33-
LOGE("{} Validation Layer: Error: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
34-
}
35-
else if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning)
36-
{
37-
LOGW("{} Validation Layer: Warning: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
38-
}
39-
else if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eInfo)
40-
{
41-
LOGI("{} Validation Layer: Information: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
42-
}
43-
else if (message_types & vk::DebugUtilsMessageTypeFlagBitsEXT::ePerformance)
44-
{
45-
LOGI("{} Validation Layer: Performance warning: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
46-
}
47-
else if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eVerbose)
48-
{
49-
LOGD("{} Validation Layer: Verbose: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
35+
case vk::DebugUtilsMessageSeverityFlagBitsEXT::eVerbose:
36+
LOGD("{}", message);
37+
break;
38+
case vk::DebugUtilsMessageSeverityFlagBitsEXT::eInfo:
39+
LOGI("{}", message);
40+
break;
41+
case vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning:
42+
LOGW("{}", message);
43+
break;
44+
case vk::DebugUtilsMessageSeverityFlagBitsEXT::eError:
45+
LOGE("{}", message);
46+
break;
47+
default:
48+
LOGE("Unknown message severity {}!\n{}", vk::to_string(message_severity), message);
49+
break;
5050
}
51-
return false;
51+
return vk::False;
5252
}
5353
#endif
5454

‎samples/extensions/full_screen_exclusive/full_screen_exclusive.cpp‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,33 @@
2121
#include "platform/window.h"
2222

2323
#if defined(VKB_DEBUG) || defined(VKB_VALIDATION_LAYERS)
24-
static VKAPI_ATTR VkBool32 VKAPI_CALL debug_callback(VkDebugUtilsMessageSeverityFlagBitsEXT message_severity, VkDebugUtilsMessageTypeFlagsEXT message_type,
24+
static VKAPI_ATTR VkBool32 VKAPI_CALL debug_callback(VkDebugUtilsMessageSeverityFlagBitsEXT message_severity,
25+
VkDebugUtilsMessageTypeFlagsEXT message_type,
2526
const VkDebugUtilsMessengerCallbackDataEXT *callback_data,
2627
void *user_data)
2728
{
28-
(void) user_data;
29-
30-
if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)
31-
{
32-
LOGE("{} Validation Layer: Error: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage)
33-
}
34-
else if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)
35-
{
36-
LOGE("{} Validation Layer: Warning: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage)
37-
}
38-
else if (message_type & VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT)
39-
{
40-
LOGI("{} Validation Layer: Performance warning: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage)
41-
}
42-
else
29+
// Log debug message
30+
std::string message = fmt::format("Debug callback {}\n{}: {}",
31+
vk::to_string(static_cast<vk::DebugUtilsMessageTypeFlagsEXT>(message_type)),
32+
callback_data->pMessageIdName,
33+
callback_data->pMessage);
34+
switch (message_severity)
4335
{
44-
LOGI("{} Validation Layer: Information: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage)
36+
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT:
37+
LOGD("{}", message);
38+
break;
39+
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT:
40+
LOGI("{}", message);
41+
break;
42+
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT:
43+
LOGW("{}", message);
44+
break;
45+
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT:
46+
LOGE("{}", message);
47+
break;
48+
default:
49+
LOGE("Unknown message severity {}!\n{}", vk::to_string(static_cast<vk::DebugUtilsMessageSeverityFlagBitsEXT>(message_severity)), message);
50+
break;
4551
}
4652
return VK_FALSE;
4753
}

0 commit comments

Comments
 (0)