From 3a3a60174ef4a016199050183450c6352eb7373d Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Tue, 3 Jan 2017 08:52:14 -0700 Subject: layers: Remove bad call to safe_struct worker fcn One of the displaymode functions was calling a safe_struct worker function incorrectly, and a special-case hack was added to have unique_objects generate this unneeded function. Change-Id: I9939b56cb254e50b60d48945a14ad223efad775e --- layers/unique_objects.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'layers/unique_objects.cpp') diff --git a/layers/unique_objects.cpp b/layers/unique_objects.cpp index 779693e3..df03daa1 100644 --- a/layers/unique_objects.cpp +++ b/layers/unique_objects.cpp @@ -648,15 +648,12 @@ VKAPI_ATTR VkResult VKAPI_CALL GetDisplayPlaneSupportedDisplaysKHR(VkPhysicalDev VKAPI_ATTR VkResult VKAPI_CALL GetDisplayModePropertiesKHR(VkPhysicalDevice physicalDevice, VkDisplayKHR display, uint32_t *pPropertyCount, VkDisplayModePropertiesKHR *pProperties) { layer_data *my_map_data = get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map); - safe_VkDisplayModePropertiesKHR *local_pProperties = NULL; + VkDisplayModePropertiesKHR *local_pProperties = NULL; { std::lock_guard lock(global_lock); display = (VkDisplayKHR)my_map_data->unique_id_mapping[reinterpret_cast(display)]; if (pProperties) { - local_pProperties = new safe_VkDisplayModePropertiesKHR[*pPropertyCount]; - for (uint32_t idx0 = 0; idx0 < *pPropertyCount; ++idx0) { - local_pProperties[idx0].initialize(&pProperties[idx0]); - } + local_pProperties = new VkDisplayModePropertiesKHR[*pPropertyCount]; } } -- cgit v1.2.3