From: Tobin Ehlis <tobine@google.com>
Date: Wed, 13 Jan 2016 21:45:14 +0000 (-0700)
Subject: layers: MR129, Remove incorrect asserts from param_checker and object_tracker
X-Git-Tag: upstream/1.1.92~4108
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db31a54c64f14a89d64245ee4d3b31fdad82acf9;p=platform%2Fupstream%2FVulkan-Tools.git

layers: MR129, Remove incorrect asserts from param_checker and object_tracker

For apps that run with multiple instances, it's perfectly valid to have instances
remaining at DestroyInstace() time so removing that assert from param_checker.
Also, the assert appears to have been cut-and-pasted into DestroyDevice of both
param_checker and object_tracker. The same logic applies for apps that use
multiple devices. Running vulkancts with layers enabled found these issues.
---

diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 58999ac..0684290 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -1795,7 +1795,6 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyInstance(
     layer_data_map.erase(pTable);
 
     pc_instance_table_map.erase(key);
-    assert(pc_instance_table_map.size() == 0 && "Should not have any instance mappings hanging around");
 }
 
 bool PostEnumeratePhysicalDevices(
@@ -2067,7 +2066,6 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyDevice(
 
     get_dispatch_table(pc_device_table_map, device)->DestroyDevice(device, pAllocator);
     pc_device_table_map.erase(key);
-    assert(pc_device_table_map.size() == 0 && "Should not have any instance mappings hanging around");
 }
 
 bool PostGetDeviceQueue(
diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index b12b474..ef9aff8 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -1657,7 +1657,6 @@ class ObjectTrackerSubcommand(Subcommand):
         gedd_txt.append('    VkLayerDispatchTable *pDisp = get_dispatch_table(object_tracker_device_table_map, device);')
         gedd_txt.append('    pDisp->DestroyDevice(device, pAllocator);')
         gedd_txt.append('    object_tracker_device_table_map.erase(key);')
-        gedd_txt.append('    assert(object_tracker_device_table_map.size() == 0 && "Should not have any instance mappings hanging around");')
         gedd_txt.append('')
         gedd_txt.append('}')
         gedd_txt.append('')