commit 1010044d03fcab4087dda7d641e00a95581ea8a2
author Courtney Goeltzenleuchter <courtney@LunarG.com> Sat Jun 13 21:36:49 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Jun 18 10:22:56 2015 -0600
tree 6b6584c52159a0ca54a0665239bc2d921005faff
parent 17fd5ceae1fc12f6e31462fc3e4e1e8743cc7591

mem_tracker: Add debug asserts

layers/mem_tracker.cpp

diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index 9497606..540bc45 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -76,16 +76,15 @@
 
 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 @@
 {
     unordered_map<VkDeviceMemory, MT_MEM_OBJ_INFO>::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 @@
             // Clear any CB bindings for completed CBs
             //   TODO : Is there a better place to do this?
 
+            assert(pInfo->object != VK_NULL_HANDLE);
             list<VkCmdBuffer>::iterator it = pInfo->pCmdBufferBindings.begin();
             list<VkCmdBuffer>::iterator temp;
             while (pInfo->pCmdBufferBindings.size() > 0 && it != pInfo->pCmdBufferBindings.end()) {
@@ -918,7 +919,7 @@
     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;
 }