commit dd28ee2f65670627849d46778ab699ca687b48a8
author Mark Lobodzinski <mark@lunarg.com> Tue Jun 04 14:20:56 2019 -0600
committer Mark Lobodzinski <mark@lunarg.com> Thu Jun 06 09:44:44 2019 -0600
tree e753248cd9d57881da4a93cbde69615761bcdb57
parent ab44b2aaa03440425ab28ee1741827839f943528

chassis: Rename dispatchers desctemplate map

Was confusingly sharing name with corechecks.

Change-Id: I0f7d9f2b37feeb2ea098c5e00b2bc1ccac2dc52d

scripts/layer_chassis_dispatch_generator.py

diff --git a/scripts/layer_chassis_dispatch_generator.py b/scripts/layer_chassis_dispatch_generator.py
index 5d3b80c..481a214 100644
--- a/scripts/layer_chassis_dispatch_generator.py
+++ b/scripts/layer_chassis_dispatch_generator.py
@@ -576,7 +576,7 @@
 
         // Shadow template createInfo for later updates
         std::unique_ptr<TEMPLATE_STATE> template_state(new TEMPLATE_STATE(*pDescriptorUpdateTemplate, local_create_info));
-        layer_data->desc_template_map[(uint64_t)*pDescriptorUpdateTemplate] = std::move(template_state);
+        layer_data->desc_template_createinfo_map[(uint64_t)*pDescriptorUpdateTemplate] = std::move(template_state);
     }
     return result;
 }
@@ -610,7 +610,7 @@
 
         // Shadow template createInfo for later updates
         std::unique_ptr<TEMPLATE_STATE> template_state(new TEMPLATE_STATE(*pDescriptorUpdateTemplate, local_create_info));
-        layer_data->desc_template_map[(uint64_t)*pDescriptorUpdateTemplate] = std::move(template_state);
+        layer_data->desc_template_createinfo_map[(uint64_t)*pDescriptorUpdateTemplate] = std::move(template_state);
     }
     return result;
 }
@@ -623,7 +623,7 @@
         return layer_data->device_dispatch_table.DestroyDescriptorUpdateTemplate(device, descriptorUpdateTemplate, pAllocator);
     std::unique_lock<std::mutex> lock(dispatch_lock);
     uint64_t descriptor_update_template_id = reinterpret_cast<uint64_t &>(descriptorUpdateTemplate);
-    layer_data->desc_template_map.erase(descriptor_update_template_id);
+    layer_data->desc_template_createinfo_map.erase(descriptor_update_template_id);
     descriptorUpdateTemplate = (VkDescriptorUpdateTemplate)unique_id_mapping[descriptor_update_template_id];
     unique_id_mapping.erase(descriptor_update_template_id);
     lock.unlock();
@@ -638,7 +638,7 @@
         return layer_data->device_dispatch_table.DestroyDescriptorUpdateTemplateKHR(device, descriptorUpdateTemplate, pAllocator);
     std::unique_lock<std::mutex> lock(dispatch_lock);
     uint64_t descriptor_update_template_id = reinterpret_cast<uint64_t &>(descriptorUpdateTemplate);
-    layer_data->desc_template_map.erase(descriptor_update_template_id);
+    layer_data->desc_template_createinfo_map.erase(descriptor_update_template_id);
     descriptorUpdateTemplate = (VkDescriptorUpdateTemplate)unique_id_mapping[descriptor_update_template_id];
     unique_id_mapping.erase(descriptor_update_template_id);
     lock.unlock();
@@ -646,8 +646,8 @@
 }
 
 void *BuildUnwrappedUpdateTemplateBuffer(ValidationObject *layer_data, uint64_t descriptorUpdateTemplate, const void *pData) {
-    auto const template_map_entry = layer_data->desc_template_map.find(descriptorUpdateTemplate);
-    if (template_map_entry == layer_data->desc_template_map.end()) {
+    auto const template_map_entry = layer_data->desc_template_createinfo_map.find(descriptorUpdateTemplate);
+    if (template_map_entry == layer_data->desc_template_createinfo_map.end()) {
         assert(0);
     }
     auto const &create_info = template_map_entry->second->create_info;

scripts/layer_chassis_generator.py

diff --git a/scripts/layer_chassis_generator.py b/scripts/layer_chassis_generator.py
index 82f27e8..b5ee1c4 100644
--- a/scripts/layer_chassis_generator.py
+++ b/scripts/layer_chassis_generator.py
@@ -339,7 +339,8 @@
         // Handle Wrapping Data
         // Reverse map display handles
         std::unordered_map<VkDisplayKHR, uint64_t> display_id_reverse_mapping;
-        std::unordered_map<uint64_t, std::unique_ptr<TEMPLATE_STATE>> desc_template_map;
+        // Wrapping Descriptor Template Update structures requires access to the template createinfo structs
+        std::unordered_map<uint64_t, std::unique_ptr<TEMPLATE_STATE>> desc_template_createinfo_map;
         struct SubpassesUsageStates {
             std::unordered_set<uint32_t> subpasses_using_color_attachment;
             std::unordered_set<uint32_t> subpasses_using_depthstencil_attachment;