diff options
Diffstat (limited to 'layers/vk_layer_logging.h')
| -rw-r--r-- | layers/vk_layer_logging.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h index 42829fea1..d21e9ffa5 100644 --- a/layers/vk_layer_logging.h +++ b/layers/vk_layer_logging.h @@ -148,8 +148,8 @@ typedef struct _debug_report_data { bool g_DEBUG_UTILS{false}; bool queueLabelHasInsert{false}; bool cmdBufLabelHasInsert{false}; - std::unordered_map<uint64_t, VkDebugMarkerObjectNameInfoEXT> debugObjectNameMap; - std::unordered_map<uint64_t, VkDebugUtilsObjectNameInfoEXT> debugUtilsObjectNameMap; + std::unordered_map<uint64_t, std::string> debugObjectNameMap; + std::unordered_map<uint64_t, std::string> debugUtilsObjectNameMap; std::unordered_map<VkQueue, std::unique_ptr<LoggingLabelState>> debugUtilsQueueLabels; std::unordered_map<VkCommandBuffer, std::unique_ptr<LoggingLabelState>> debugUtilsCmdBufLabels; // This mutex is defined as mutable since the normal usage for a debug report object is as 'const'. The mutable keyword allows @@ -158,8 +158,8 @@ typedef struct _debug_report_data { void DebugReportSetUtilsObjectName(const VkDebugUtilsObjectNameInfoEXT *pNameInfo) { std::unique_lock<std::mutex> lock(debug_report_mutex); - if (pNameInfo) { - debugUtilsObjectNameMap[pNameInfo->objectHandle] = *pNameInfo; + if (pNameInfo->pObjectName) { + debugUtilsObjectNameMap[pNameInfo->objectHandle] = pNameInfo->pObjectName; } else { debugUtilsObjectNameMap.erase(pNameInfo->objectHandle); } @@ -167,8 +167,8 @@ typedef struct _debug_report_data { void DebugReportSetMarkerObjectName(const VkDebugMarkerObjectNameInfoEXT *pNameInfo) { std::unique_lock<std::mutex> lock(debug_report_mutex); - if (pNameInfo) { - debugObjectNameMap[pNameInfo->object] = *pNameInfo; + if (pNameInfo->pObjectName) { + debugObjectNameMap[pNameInfo->object] = pNameInfo->pObjectName; } else { debugObjectNameMap.erase(pNameInfo->object); } @@ -178,7 +178,7 @@ typedef struct _debug_report_data { std::string label = ""; const auto utils_name_iter = debugUtilsObjectNameMap.find(object); if (utils_name_iter != debugUtilsObjectNameMap.end()) { - label = utils_name_iter->second.pObjectName; + label = utils_name_iter->second; } return label; } @@ -187,7 +187,7 @@ typedef struct _debug_report_data { std::string label = ""; const auto marker_name_iter = debugObjectNameMap.find(object); if (marker_name_iter != debugObjectNameMap.end()) { - label = marker_name_iter->second.pObjectName; + label = marker_name_iter->second; } return label; } |