From a8901efd8e753d01bc5763dba3405d2e4485a5c7 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Tue, 2 May 2017 16:54:24 -0700 Subject: layers: Store instance data in UO::layer_data rather than gpu handle --- layers/unique_objects.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'layers/unique_objects.cpp') diff --git a/layers/unique_objects.cpp b/layers/unique_objects.cpp index 03d240f4..6cb9a1c0 100644 --- a/layers/unique_objects.cpp +++ b/layers/unique_objects.cpp @@ -206,7 +206,7 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateDevice(VkPhysicalDevice gpu, const VkDevice createDeviceRegisterExtensions(pCreateInfo, *pDevice); // Set gpu for this device in order to get at any objects mapped at instance level - my_device_data->gpu = gpu; + my_device_data->instance_data = my_instance_data; return result; } @@ -462,7 +462,7 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateSwapchainKHR(VkDevice device, const VkSwapc local_pCreateInfo->oldSwapchain = (VkSwapchainKHR)my_map_data->unique_id_mapping[reinterpret_cast(pCreateInfo->oldSwapchain)]; // Need to pull surface mapping from the instance-level map - instance_layer_data *instance_data = GetLayerDataPtr(get_dispatch_key(my_map_data->gpu), instance_layer_data_map); + instance_layer_data *instance_data = my_map_data->instance_data; local_pCreateInfo->surface = (VkSurfaceKHR)instance_data->unique_id_mapping[reinterpret_cast(pCreateInfo->surface)]; } @@ -490,7 +490,7 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateSharedSwapchainsKHR(VkDevice device, uint32 std::lock_guard lock(global_lock); if (pCreateInfos) { // Need to pull surface mapping from the instance-level map - instance_layer_data *instance_data = GetLayerDataPtr(get_dispatch_key(dev_data->gpu), instance_layer_data_map); + instance_layer_data *instance_data = dev_data->instance_data; local_pCreateInfos = new safe_VkSwapchainCreateInfoKHR[swapchainCount]; for (uint32_t i = 0; i < swapchainCount; ++i) { local_pCreateInfos[i].initialize(&pCreateInfos[i]); -- cgit v1.2.3