From ca9aef52017e074544f718ef9095c22efff347c2 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Thu, 9 Mar 2017 15:31:42 -0700 Subject: layers: Move update_template temp structure creation Change-Id: Ib24bfc08114b8bdded7df0e69bfe3ea531e9df20 --- layers/core_validation.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 1598b402..8d7cb016 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -11430,18 +11430,13 @@ 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; - { - std::lock_guard lock(global_lock); - if (pCreateInfo) { - local_create_info = new safe_VkDescriptorUpdateTemplateCreateInfoKHR(pCreateInfo); - } - } - VkResult result = dev_data->dispatch_table.CreateDescriptorUpdateTemplateKHR( - device, (const VkDescriptorUpdateTemplateCreateInfoKHR *)local_create_info, pAllocator, pDescriptorUpdateTemplate); + VkResult result = + dev_data->dispatch_table.CreateDescriptorUpdateTemplateKHR(device, pCreateInfo, pAllocator, pDescriptorUpdateTemplate); if (VK_SUCCESS == result) { std::lock_guard lock(global_lock); // Shadow template createInfo for later updates + safe_VkDescriptorUpdateTemplateCreateInfoKHR *local_create_info = + new safe_VkDescriptorUpdateTemplateCreateInfoKHR(pCreateInfo); std::unique_ptr template_state(new TEMPLATE_STATE(*pDescriptorUpdateTemplate, local_create_info)); dev_data->desc_template_map[*pDescriptorUpdateTemplate] = std::move(template_state); } -- cgit v1.2.3