diff options
| author | Chris Forbes <chrisforbes@google.com> | 2017-05-02 16:54:24 -0700 |
|---|---|---|
| committer | Chris Forbes <chrisf@ijw.co.nz> | 2017-05-03 11:38:06 -0700 |
| commit | a8901efd8e753d01bc5763dba3405d2e4485a5c7 (patch) | |
| tree | 9000ae7db5b3dc35172fdae50585966b63b080f6 /layers/unique_objects.cpp | |
| parent | 57234b444a2e0751f259e325ae3060f08b23616d (diff) | |
| download | usermoji-a8901efd8e753d01bc5763dba3405d2e4485a5c7.tar.xz | |
layers: Store instance data in UO::layer_data rather than gpu handle
Diffstat (limited to 'layers/unique_objects.cpp')
| -rw-r--r-- | layers/unique_objects.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<const uint64_t &>(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<const uint64_t &>(pCreateInfo->surface)]; } @@ -490,7 +490,7 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateSharedSwapchainsKHR(VkDevice device, uint32 std::lock_guard<std::mutex> 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]); |