From 4a1572c647e1b063b2d0e06f026d7645c51a486d Mon Sep 17 00:00:00 2001 From: Tony Barbour Date: Mon, 19 Jun 2017 16:50:37 -0600 Subject: layers: Add names to objects and print in validation Change-Id: Ie6587c26c8528ffac5698b8cb3ca2c4cc86b1dfd layers: Fill out the rest of debug marker calls Change-Id: I0c4085e36e5c06e11c0c09d1ca126ae6db35526d --- layers/object_tracker.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'layers/object_tracker.cpp') diff --git a/layers/object_tracker.cpp b/layers/object_tracker.cpp index 1265524a..87903173 100644 --- a/layers/object_tracker.cpp +++ b/layers/object_tracker.cpp @@ -4534,12 +4534,18 @@ VKAPI_ATTR VkResult VKAPI_CALL DebugMarkerSetObjectTagEXT(VkDevice device, VkDeb VKAPI_ATTR VkResult VKAPI_CALL DebugMarkerSetObjectNameEXT(VkDevice device, VkDebugMarkerObjectNameInfoEXT *pNameInfo) { bool skip = VK_FALSE; std::unique_lock lock(global_lock); + layer_data *dev_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map); + if (pNameInfo->pObjectName) { + dev_data->report_data->debugObjectNameMap->insert( + std::make_pair((uint64_t &&)pNameInfo->object, pNameInfo->pObjectName)); + } else { + dev_data->report_data->debugObjectNameMap->erase(pNameInfo->object); + } skip |= ValidateObject(device, device, kVulkanObjectTypeDevice, false, VALIDATION_ERROR_23605601, VALIDATION_ERROR_UNDEFINED); lock.unlock(); if (skip) { return VK_ERROR_VALIDATION_FAILED_EXT; } - layer_data *dev_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map); VkResult result = dev_data->dispatch_table.DebugMarkerSetObjectNameEXT(device, pNameInfo); return result; } -- cgit v1.2.3