commit ef4da506942ef6ed0627b43535340e641c10d1f1
author Mark Lobodzinski <mark@lunarg.com> Thu Sep 28 15:18:18 2017 -0600
committer Mike Schuchardt <mikes@lunarg.com> Fri Mar 09 13:54:31 2018 -0700
tree c0efed644adc0019463e37fa6b0bbfe1122a8e79
parent c8d0224640a5299fc14ead9073f696649dd8a3fe

layers: Fixed issues due to safe struct renames

layers/core_validation.cpp

diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 97e0646..9a77713 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -11812,8 +11812,8 @@
     if (VK_SUCCESS == result) {
         lock_guard_t lock(global_lock);
         // Shadow template createInfo for later updates
-        safe_VkDescriptorUpdateTemplateCreateInfoKHR *local_create_info =
-            new safe_VkDescriptorUpdateTemplateCreateInfoKHR(pCreateInfo);
+        safe_VkDescriptorUpdateTemplateCreateInfo *local_create_info =
+            new safe_VkDescriptorUpdateTemplateCreateInfo(pCreateInfo);
         std::unique_ptr<TEMPLATE_STATE> template_state(new TEMPLATE_STATE(*pDescriptorUpdateTemplate, local_create_info));
         dev_data->desc_template_map[*pDescriptorUpdateTemplate] = std::move(template_state);
     }

layers/core_validation_types.h

diff --git a/layers/core_validation_types.h b/layers/core_validation_types.h
index 3a4b0cb..da0bfc9 100644
--- a/layers/core_validation_types.h
+++ b/layers/core_validation_types.h
@@ -488,9 +488,9 @@
 
 struct TEMPLATE_STATE {
     VkDescriptorUpdateTemplateKHR desc_update_template;
-    safe_VkDescriptorUpdateTemplateCreateInfoKHR create_info;
+    safe_VkDescriptorUpdateTemplateCreateInfo create_info;
 
-    TEMPLATE_STATE(VkDescriptorUpdateTemplateKHR update_template, safe_VkDescriptorUpdateTemplateCreateInfoKHR *pCreateInfo)
+    TEMPLATE_STATE(VkDescriptorUpdateTemplateKHR update_template, safe_VkDescriptorUpdateTemplateCreateInfo *pCreateInfo)
         : desc_update_template(update_template), create_info(*pCreateInfo) {}
 };
 

layers/unique_objects.cpp

diff --git a/layers/unique_objects.cpp b/layers/unique_objects.cpp
index e45b672..951120d 100644
--- a/layers/unique_objects.cpp
+++ b/layers/unique_objects.cpp
@@ -564,11 +564,11 @@
                                                                  const VkAllocationCallbacks *pAllocator,
                                                                  VkDescriptorUpdateTemplateKHR *pDescriptorUpdateTemplate) {
     layer_data *dev_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
-    safe_VkDescriptorUpdateTemplateCreateInfoKHR *local_create_info = NULL;
+    safe_VkDescriptorUpdateTemplateCreateInfo *local_create_info = NULL;
     {
         std::lock_guard<std::mutex> lock(global_lock);
         if (pCreateInfo) {
-            local_create_info = new safe_VkDescriptorUpdateTemplateCreateInfoKHR(pCreateInfo);
+            local_create_info = new safe_VkDescriptorUpdateTemplateCreateInfo(pCreateInfo);
             if (pCreateInfo->descriptorSetLayout) {
                 local_create_info->descriptorSetLayout = Unwrap(pCreateInfo->descriptorSetLayout);
             }