diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2017-09-28 15:18:18 -0600 |
|---|---|---|
| committer | Mike Schuchardt <mikes@lunarg.com> | 2018-03-09 13:54:31 -0700 |
| commit | 590e10f46e0dea6768ce45ca0f530a6adea5d264 (patch) | |
| tree | 9688bd22477fc94099c44f47c4e58e994da04839 | |
| parent | 59c391296a6af01fbec5ac705aa699711a423a27 (diff) | |
| download | usermoji-590e10f46e0dea6768ce45ca0f530a6adea5d264.tar.xz | |
layers: Fixed issues due to safe struct renames
| -rw-r--r-- | layers/core_validation.cpp | 4 | ||||
| -rw-r--r-- | layers/core_validation_types.h | 4 | ||||
| -rw-r--r-- | layers/unique_objects.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 97e06465..9a77713d 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -11812,8 +11812,8 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateDescriptorUpdateTemplateKHR(VkDevice device 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); } diff --git a/layers/core_validation_types.h b/layers/core_validation_types.h index 3a4b0cb9..da0bfc93 100644 --- a/layers/core_validation_types.h +++ b/layers/core_validation_types.h @@ -488,9 +488,9 @@ enum CBStatusFlagBits { 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) {} }; diff --git a/layers/unique_objects.cpp b/layers/unique_objects.cpp index e45b672f..951120dc 100644 --- a/layers/unique_objects.cpp +++ b/layers/unique_objects.cpp @@ -564,11 +564,11 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateDescriptorUpdateTemplateKHR(VkDevice device 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); } |