-
Notifications
You must be signed in to change notification settings - Fork 839
Align all general DebugUtilsMessengerCallbacks as in hpp_hello_triangle. #1579
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
asuessenbach
wants to merge
1
commit into
KhronosGroup:main
Choose a base branch
from
asuessenbach:debug_callback
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,27 +25,33 @@ | |
|
|
||
| #if defined(VKB_DEBUG) || defined(VKB_VALIDATION_LAYERS) | ||
| /// @brief A debug callback used to report messages from the validation layers. See instance creation for details on how this is set up | ||
| static VKAPI_ATTR VkBool32 VKAPI_CALL debug_callback(VkDebugUtilsMessageSeverityFlagBitsEXT message_severity, VkDebugUtilsMessageTypeFlagsEXT message_type, | ||
| static VKAPI_ATTR VkBool32 VKAPI_CALL debug_callback(VkDebugUtilsMessageSeverityFlagBitsEXT message_severity, | ||
| VkDebugUtilsMessageTypeFlagsEXT message_type, | ||
| const VkDebugUtilsMessengerCallbackDataEXT *callback_data, | ||
| void *user_data) | ||
| { | ||
| (void) user_data; | ||
|
|
||
| if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) | ||
| { | ||
| LOGE("{} Validation Layer: Error: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage) | ||
| } | ||
| else if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) | ||
| { | ||
| LOGE("{} Validation Layer: Warning: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage) | ||
| } | ||
| else if (message_type & VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT) | ||
| { | ||
| LOGI("{} Validation Layer: Performance warning: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage) | ||
| } | ||
| else | ||
| { | ||
| LOGI("{} Validation Layer: Information: {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage) | ||
| // Log debug message | ||
| std::string message = fmt::format("Debug callback {}\n{}: {}", | ||
| vk::to_string(static_cast<vk::DebugUtilsMessageTypeFlagsEXT>(message_type)), | ||
| callback_data->pMessageIdName, | ||
| callback_data->pMessage); | ||
| switch (message_severity) | ||
| { | ||
| case VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT: | ||
| LOGD("{}", message); | ||
| break; | ||
| case VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT: | ||
| LOGI("{}", message); | ||
| break; | ||
| case VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT: | ||
| LOGW("{}", message); | ||
| break; | ||
| case VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT: | ||
| LOGE("{}", message); | ||
| break; | ||
| default: | ||
| LOGE("Unknown message severity {}!\n{}", vk::to_string(static_cast<vk::DebugUtilsMessageSeverityFlagBitsEXT>(message_severity)), message); | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same as above: Is there a vk::to_string variant that works with the plain C type instead? |
||
| break; | ||
| } | ||
| return VK_FALSE; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a vk::to_string variant that works with the plain C type instead?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nope.
We have some
vkb::to_string, though, that would give you just some number. Should I change to that?