From b5bf061fe5b0c3c56fd658008d494eed07fb3cb1 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 6 Oct 2016 11:07:30 +1300 Subject: layers: Add handle to SWAPCHAIN_NODE Signed-off-by: Chris Forbes --- layers/core_validation.cpp | 2 +- layers/core_validation_types.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 4ae50c71..84c8182c 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -11164,7 +11164,7 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateSwapchainKHR(VkDevice device, const VkSwapc if (VK_SUCCESS == result) { std::lock_guard lock(global_lock); - dev_data->device_extensions.swapchainMap[*pSwapchain] = unique_ptr(new SWAPCHAIN_NODE(pCreateInfo)); + dev_data->device_extensions.swapchainMap[*pSwapchain] = unique_ptr(new SWAPCHAIN_NODE(pCreateInfo, *pSwapchain)); } return result; diff --git a/layers/core_validation_types.h b/layers/core_validation_types.h index 69012afb..9e58c232 100644 --- a/layers/core_validation_types.h +++ b/layers/core_validation_types.h @@ -241,9 +241,10 @@ struct DEVICE_MEM_INFO : public BASE_NODE { class SWAPCHAIN_NODE { public: safe_VkSwapchainCreateInfoKHR createInfo; + VkSwapchainKHR swapchain; std::vector images; - SWAPCHAIN_NODE(const VkSwapchainCreateInfoKHR *pCreateInfo) - : createInfo(pCreateInfo) {} + SWAPCHAIN_NODE(const VkSwapchainCreateInfoKHR *pCreateInfo, VkSwapchainKHR swapchain) + : createInfo(pCreateInfo), swapchain(swapchain) {} }; enum DRAW_TYPE { -- cgit v1.2.3