From 6b504e92df751b4c99fc638ede5c8a95dbb4614a Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Mon, 2 May 2016 13:19:15 -0600 Subject: layers: Correct and/or remove obsolete object_tracker error enums Change-Id: I6f759890749fb17226e00d28ab8391dc7cc0e80c --- layers/object_tracker.h | 2 -- vk-layer-generate.py | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/layers/object_tracker.h b/layers/object_tracker.h index 90554e00..d5b4bb78 100644 --- a/layers/object_tracker.h +++ b/layers/object_tracker.h @@ -33,9 +33,7 @@ typedef enum _OBJECT_TRACK_ERROR { OBJTRACK_NONE, // Used for INFO & other non-error messages OBJTRACK_UNKNOWN_OBJECT, // Updating uses of object that's not in global object list OBJTRACK_INTERNAL_ERROR, // Bug with data tracking within the layer - OBJTRACK_DESTROY_OBJECT_FAILED, // Couldn't find object to be destroyed OBJTRACK_OBJECT_LEAK, // OBJECT was not correctly freed/destroyed - OBJTRACK_OBJCOUNT_MAX_EXCEEDED, // Request for Object data in excess of max obj count OBJTRACK_INVALID_OBJECT, // Object used that has never been created OBJTRACK_DESCRIPTOR_POOL_MISMATCH, // Descriptor Pools specified incorrectly OBJTRACK_COMMAND_POOL_MISMATCH, // Command Pools specified incorrectly diff --git a/vk-layer-generate.py b/vk-layer-generate.py index 3a07ce95..062f3265 100755 --- a/vk-layer-generate.py +++ b/vk-layer-generate.py @@ -812,9 +812,10 @@ class ObjectTrackerSubcommand(Subcommand): procs_txt.append(' delete pNode;') procs_txt.append(' %sMap.erase(it);' % (o)) procs_txt.append(' } else {') - procs_txt.append(' log_msg(mdd(dispatchable_object), VK_DEBUG_REPORT_ERROR_BIT_EXT, (VkDebugReportObjectTypeEXT ) 0, object_handle, __LINE__, OBJTRACK_NONE, "OBJTRACK",') + procs_txt.append(' log_msg(mdd(dispatchable_object), VK_DEBUG_REPORT_ERROR_BIT_EXT, (VkDebugReportObjectTypeEXT ) 0,') + procs_txt.append(' object_handle, __LINE__, OBJTRACK_UNKNOWN_OBJECT, "OBJTRACK",') procs_txt.append(' "Unable to remove obj 0x%" PRIxLEAST64 ". Was it created? Has it already been destroyed?",') - procs_txt.append(' object_handle);') + procs_txt.append(' object_handle);') procs_txt.append(' }') procs_txt.append('}') procs_txt.append('') -- cgit v1.2.3