diff options
| author | Tobin Ehlis <tobine@google.com> | 2016-06-02 12:45:31 -0600 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-06-02 16:58:47 -0600 |
| commit | 50619b9017896f33b5f428f4dad7be303f53a4b6 (patch) | |
| tree | ce9e6df0db53e2e31dc11849da4a8ee88893bee5 /layers/core_validation.cpp | |
| parent | 07286c1f26b9bc37f84cccbcfcff77e0b9ef7a38 (diff) | |
| download | usermoji-50619b9017896f33b5f428f4dad7be303f53a4b6.tar.xz | |
layers: Update swapchainMap to use unique_ptr
Diffstat (limited to 'layers/core_validation.cpp')
| -rw-r--r-- | layers/core_validation.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 53b416f4..a281d804 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -102,7 +102,7 @@ struct CMD_POOL_INFO { struct devExts { bool wsi_enabled; - unordered_map<VkSwapchainKHR, SWAPCHAIN_NODE *> swapchainMap; + unordered_map<VkSwapchainKHR, unique_ptr<SWAPCHAIN_NODE>> swapchainMap; unordered_map<VkImage, VkSwapchainKHR> imageToSwapchainMap; }; @@ -299,7 +299,7 @@ SWAPCHAIN_NODE *getSwapchainNode(const layer_data *dev_data, const VkSwapchainKH if (swp_it == dev_data->device_extensions.swapchainMap.end()) { return nullptr; } - return swp_it->second; + return swp_it->second.get(); } // Return swapchain for specified image or else NULL VkSwapchainKHR getSwapchainFromImage(const layer_data *dev_data, const VkImage image) { @@ -9675,9 +9675,8 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateSwapchainKHR(VkDevice device, const VkSwapc VkResult result = dev_data->device_dispatch_table->CreateSwapchainKHR(device, pCreateInfo, pAllocator, pSwapchain); if (VK_SUCCESS == result) { - SWAPCHAIN_NODE *psc_node = new SWAPCHAIN_NODE(pCreateInfo); std::lock_guard<std::mutex> lock(global_lock); - dev_data->device_extensions.swapchainMap[*pSwapchain] = psc_node; + dev_data->device_extensions.swapchainMap[*pSwapchain] = unique_ptr<SWAPCHAIN_NODE>(new SWAPCHAIN_NODE(pCreateInfo)); } return result; @@ -9708,7 +9707,6 @@ DestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapchain, const VkAllocatio dev_data->imageMap.erase(swapchain_image); } } - delete swapchain_data; dev_data->device_extensions.swapchainMap.erase(swapchain); } lock.unlock(); |