openharmony/third_party_vulkan-loader
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_vulkan-loader synced 2024-11-23 15:20:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: Modify vk_layer_logging.h for hdr 1.1.95

Browse Source 
The `VkDebugUtilsObjectNameInfoEXT` member of the
`VkDebugUtilsMessengerCallbackDataEXT` struct was turned const in Vulkan
header 1.1.95 and modifications were required for compilation

Change-Id: I0e52d821239a2b74c8880864a9522359f2285d72
This commit is contained in:
Shannon McPherson 2018-12-03 11:20:52 -07:00
parent 5cdde103ac
commit c389e8ca45
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tests/layers/vk_layer_logging.h
View File

@ -298,18 +298,18 @@ static inline bool debug_log_msg(const debug_report_data *debug_data, VkFlags ms
}
}
// Look for any debug utils or marker names to use for this object
callback_data.pObjects[0].pObjectName = NULL;
object_name_info.pObjectName = NULL;
auto utils_name_iter = debug_data->debugUtilsObjectNameMap->find(src_object);
if (utils_name_iter != debug_data->debugUtilsObjectNameMap->end()) {
callback_data.pObjects[0].pObjectName = utils_name_iter->second.c_str();
object_name_info.pObjectName = utils_name_iter->second.c_str();
} else {
auto marker_name_iter = debug_data->debugObjectNameMap->find(src_object);
if (marker_name_iter != debug_data->debugObjectNameMap->end()) {
callback_data.pObjects[0].pObjectName = marker_name_iter->second.c_str();
object_name_info.pObjectName = marker_name_iter->second.c_str();
}
}
if (NULL != callback_data.pObjects[0].pObjectName) {
oss << " (Name = " << callback_data.pObjects[0].pObjectName << " : Type = ";
if (NULL != object_name_info.pObjectName) {
oss << " (Name = " << object_name_info.pObjectName << " : Type = ";
} else {
oss << " (Type = ";
}
@ -378,7 +378,8 @@ static inline void DebugAnnotFlagsToReportFlags(VkDebugUtilsMessageSeverityFlagB
static inline bool debug_messenger_log_msg(const debug_report_data *debug_data,
VkDebugUtilsMessageSeverityFlagBitsEXT message_severity,
VkDebugUtilsMessageTypeFlagsEXT message_type,
VkDebugUtilsMessengerCallbackDataEXT *callback_data) {
VkDebugUtilsMessengerCallbackDataEXT *callback_data,
const VkDebugUtilsMessengerEXT *messenger) {
bool bail = false;
VkLayerDbgFunctionNode *layer_dbg_node = NULL;
@ -392,16 +393,21 @@ static inline bool debug_messenger_log_msg(const debug_report_data *debug_data,
DebugAnnotFlagsToReportFlags(message_severity, message_type, &object_flags);
VkDebugUtilsObjectNameInfoEXT object_name_info;
object_name_info.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT;
object_name_info.pNext = NULL;
object_name_info.objectType = VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT;
object_name_info.objectHandle = HandleToUint64(*messenger);
object_name_info.pObjectName = NULL;
callback_data->pObjects = &object_name_info;
callback_data->objectCount = 1;
while (layer_dbg_node) {
if (layer_dbg_node->is_messenger && (layer_dbg_node->messenger.messageSeverity & message_severity) &&
(layer_dbg_node->messenger.messageType & message_type)) {
// Loop through each object and give it the proper name if it was set.
for (uint32_t obj = 0; obj < callback_data->objectCount; obj++) {
auto it = debug_data->debugUtilsObjectNameMap->find(callback_data->pObjects[obj].objectHandle);
if (it == debug_data->debugUtilsObjectNameMap->end()) {
continue;
}
callback_data->pObjects[obj].pObjectName = it->second.c_str();
auto it = debug_data->debugUtilsObjectNameMap->find(object_name_info.objectHandle);
if (it != debug_data->debugUtilsObjectNameMap->end()) {
object_name_info.pObjectName = it->second.c_str();
}
if (layer_dbg_node->messenger.pfnUserCallback(message_severity, message_type, callback_data,
layer_dbg_node->pUserData)) {
@ -513,7 +519,6 @@ static inline VkResult layer_create_messenger_callback(debug_report_data *debug_
}
VkDebugUtilsMessengerCallbackDataEXT callback_data = {};
VkDebugUtilsObjectNameInfoEXT blank_object = {};
callback_data.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CALLBACK_DATA_EXT;
callback_data.pNext = NULL;
callback_data.flags = 0;
@ -524,15 +529,10 @@ static inline VkResult layer_create_messenger_callback(debug_report_data *debug_
callback_data.pQueueLabels = NULL;
callback_data.cmdBufLabelCount = 0;
callback_data.pCmdBufLabels = NULL;
callback_data.objectCount = 1;
callback_data.pObjects = &blank_object;
blank_object.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT;
blank_object.pNext = NULL;
blank_object.objectType = VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT;
blank_object.objectHandle = HandleToUint64(*messenger);
blank_object.pObjectName = NULL;
callback_data.objectCount = 0;
callback_data.pObjects = NULL;
debug_messenger_log_msg(debug_data, VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT,
VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT, &callback_data);
VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT, &callback_data, messenger);
return VK_SUCCESS;
}