From 1071044166696d985e768e7fb4cc190d64661074 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Sat, 13 Jun 2015 21:36:49 -0600 Subject: mem_tracker: Add debug asserts --- layers/mem_tracker.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'layers/mem_tracker.cpp') diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp index 94976062..540bc455 100644 --- a/layers/mem_tracker.cpp +++ b/layers/mem_tracker.cpp @@ -76,16 +76,15 @@ template layer_data *get_my_data_ptr( debug_report_data *mdd(VkObject object) { -// VkLayerDispatchTable *pTable = get_dispatch_table(mem_tracker_device_table_map, object); -// layer_data *my_data = get_my_data_ptr(pTable, layer_data_map); layer_data *my_data = get_my_data_ptr(get_dispatch_key(object), layer_data_map); + assert(my_data->report_data != NULL); return my_data->report_data; } debug_report_data *mid(VkInstance object) { -// VkLayerInstanceDispatchTable *pTable = get_dispatch_table(mem_tracker_instance_table_map, object); layer_data *my_data = get_my_data_ptr(get_dispatch_key(object), layer_data_map); + assert(my_data->report_data != NULL); return my_data->report_data; } @@ -249,6 +248,7 @@ static MT_MEM_OBJ_INFO* get_mem_obj_info( { unordered_map::iterator item = memObjMap.find(mem); if (item != memObjMap.end()) { + assert((*item).second.object != VK_NULL_HANDLE); return &(*item).second; } else { return NULL; @@ -500,6 +500,7 @@ static bool32_t freeMemObjInfo( // Clear any CB bindings for completed CBs // TODO : Is there a better place to do this? + assert(pInfo->object != VK_NULL_HANDLE); list::iterator it = pInfo->pCmdBufferBindings.begin(); list::iterator temp; while (pInfo->pCmdBufferBindings.size() > 0 && it != pInfo->pCmdBufferBindings.end()) { @@ -918,7 +919,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkDestroyDevice( dispatch_key key = get_dispatch_key(device); VkResult result = get_dispatch_table(mem_tracker_device_table_map, device)->DestroyDevice(device); mem_tracker_device_table_map.erase(key); - assert(mem_tracker_instance_table_map.size() == 0 && "Should not have any instance mappings hanging around"); + assert(mem_tracker_device_table_map.size() == 0 && "Should not have any instance mappings hanging around"); return result; } -- cgit v1.2.3