diff options
| author | Mark Young <marky@lunarg.com> | 2018-05-30 08:41:25 -0600 |
|---|---|---|
| committer | Mark Young <marky@lunarg.com> | 2018-05-30 13:08:59 -0600 |
| commit | c234779732d89111e6e8fcea785b56be80896bb2 (patch) | |
| tree | 1f3d5ab15e424c98db839a51895e564604eb733a /layers | |
| parent | ce38afc0e1dc4f3673a2d5e21943449ae71b5323 (diff) | |
| download | vulkan-validation-layers-c234779732d89111e6e8fcea785b56be80896bb2.tar.gz | |
layers: #146-Fix message type conversion
Fix the conversion of the DebugReport message types into the
DebugUtils message severity/types. This was caught by @RCalocaO.
Change-Id: Ib0670e89867b16e8a48f2a2c760c46cc31ee253e
Diffstat (limited to 'layers')
| -rw-r--r-- | layers/vk_layer_logging.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h index 3a58045d0..8bfeaaa49 100644 --- a/layers/vk_layer_logging.h +++ b/layers/vk_layer_logging.h @@ -88,23 +88,23 @@ template debug_report_data *GetLayerDataPtr<debug_report_data>(void *data_key, static inline void DebugReportFlagsToAnnotFlags(VkDebugReportFlagsEXT dr_flags, bool default_flag_is_spec, VkDebugUtilsMessageSeverityFlagsEXT *da_severity, VkDebugUtilsMessageTypeFlagsEXT *da_type) { - // All layer warnings are spec warnings currently. At least as far as anything not specifically - // called out. In the future, we'll label things using the new split severity and type values. - *da_type = VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT; *da_severity = 0; + // If it's explicitly listed as a performance warning, treat it as a performance message. + // Otherwise, treat it as a validation issue. + if ((dr_flags & VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT) != 0) { + *da_type = VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT; + } else { + *da_type = VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT; + } if ((dr_flags & VK_DEBUG_REPORT_DEBUG_BIT_EXT) != 0) { *da_severity |= VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT; - *da_type |= VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT; + // If this is a debug message, it's really intended for the general messages + *da_type = VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT; } if ((dr_flags & VK_DEBUG_REPORT_INFORMATION_BIT_EXT) != 0) { *da_severity |= VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT; - *da_type |= VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT; - } - if ((dr_flags & VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT) != 0) { - *da_severity |= VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT; - *da_type |= VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT; } - if ((dr_flags & VK_DEBUG_REPORT_WARNING_BIT_EXT) != 0) { + if ((dr_flags & VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT) != 0 || (dr_flags & VK_DEBUG_REPORT_WARNING_BIT_EXT) != 0) { *da_severity |= VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT; } if ((dr_flags & VK_DEBUG_REPORT_ERROR_BIT_EXT) != 0) { |