From 8f665690986636017315357735fd46a89f31da3b Mon Sep 17 00:00:00 2001
From: Tobin Ehlis <tobine@google.com>
Date: Thu, 21 Jan 2016 10:21:04 -0700
Subject: [PATCH] layers: Fix draw_state validation of descriptor updates with
 images

Earlier fix was broken b/c we didn't have format of swapchain images.

This fix adds the format to imageLayoutMap IMAGE_NODE struct, which contains all images created via vkCreateImage() as well as all swapchain images fetched via vkGetSwapchainImagesKHR().

This required enhancing the SWAPCHAIN_NODE to include the createInfo. Since this has a dangling ptr for queueIndices, added a constructor and destructor to that struct to handle allocation and clean-up of that ptr.
---
 layers/draw_state.cpp | 12 +++++++-----
 layers/draw_state.h   | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index de2a164..d50fbaa 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2044,9 +2044,8 @@ static VkBool32 validateImageView(const layer_data* my_data, const VkImageView*
         VkImageAspectFlags aspectMask = ivIt->second->subresourceRange.aspectMask;
         VkImage image = ivIt->second->image;
         // TODO : Check here in case we have a bad image
-        auto imgIt = my_data->imageMap.find(image);
-        auto swapChainImageIt = my_data->imageLayoutMap.find(image);
-        if ((imgIt == my_data->imageMap.end()) && (swapChainImageIt == my_data->imageLayoutMap.end())) {
+        auto imgIt = my_data->imageLayoutMap.find(image);
+        if (imgIt == my_data->imageLayoutMap.end()) {
             skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, (uint64_t) image, __LINE__, DRAWSTATE_IMAGEVIEW_DESCRIPTOR_ERROR, "DS",
                 "vkUpdateDescriptorSets: Attempt to update descriptor with invalid image %#" PRIxLEAST64 " in imageView %#" PRIxLEAST64, (uint64_t) image, (uint64_t) *pImageView);
         } else {
@@ -3675,6 +3674,7 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateImage(VkDevice device, co
     if (VK_SUCCESS == result) {
         IMAGE_NODE* image_node = new IMAGE_NODE;
         image_node->layout = pCreateInfo->initialLayout;
+        image_node->format = pCreateInfo->format;
         loader_platform_thread_lock_mutex(&globalLock);
         dev_data->imageMap[*pImage] = unique_ptr<VkImageCreateInfo>(new VkImageCreateInfo(*pCreateInfo));
         dev_data->imageLayoutMap[*pImage] = image_node;
@@ -6064,7 +6064,7 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateSwapchainKHR(
     VkResult result = dev_data->device_dispatch_table->CreateSwapchainKHR(device, pCreateInfo, pAllocator, pSwapchain);
 
     if (VK_SUCCESS == result) {
-        SWAPCHAIN_NODE *swapchain_data = new SWAPCHAIN_NODE;
+        SWAPCHAIN_NODE *swapchain_data = new SWAPCHAIN_NODE(pCreateInfo);
         loader_platform_thread_lock_mutex(&globalLock);
         dev_data->device_extensions.swapchainMap[*pSwapchain] = swapchain_data;
         loader_platform_thread_unlock_mutex(&globalLock);
@@ -6113,7 +6113,9 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainImagesKHR(
             IMAGE_NODE* image_node = new IMAGE_NODE;
             image_node->layout = VK_IMAGE_LAYOUT_UNDEFINED;
             loader_platform_thread_lock_mutex(&globalLock);
-            dev_data->device_extensions.swapchainMap[swapchain]->images.push_back(pSwapchainImages[i]);
+            auto swapchain_node = dev_data->device_extensions.swapchainMap[swapchain];
+            image_node->format = swapchain_node->createInfo.imageFormat;
+            swapchain_node->images.push_back(pSwapchainImages[i]);
             dev_data->imageLayoutMap[pSwapchainImages[i]] = image_node;
             loader_platform_thread_unlock_mutex(&globalLock);
         }
diff --git a/layers/draw_state.h b/layers/draw_state.h
index 45e8955..aeafce0 100755
--- a/layers/draw_state.h
+++ b/layers/draw_state.h
@@ -211,6 +211,7 @@ typedef struct _SAMPLER_NODE {
 
 typedef struct _IMAGE_NODE {
     VkImageLayout layout;
+    VkFormat      format;
 } IMAGE_NODE;
 
 typedef struct _IMAGE_CMD_BUF_NODE {
@@ -526,5 +527,22 @@ typedef struct _GLOBAL_CB_NODE {
 } GLOBAL_CB_NODE;
 
 typedef struct _SWAPCHAIN_NODE {
+    VkSwapchainCreateInfoKHR    createInfo;
+    uint32_t*                   pQueueFamilyIndices;
     std::vector<VkImage>        images;
+    _SWAPCHAIN_NODE(const VkSwapchainCreateInfoKHR *pCreateInfo) :
+        createInfo(*pCreateInfo),
+        pQueueFamilyIndices(NULL)
+    {
+        if (pCreateInfo->queueFamilyIndexCount) {
+            pQueueFamilyIndices = new uint32_t[pCreateInfo->queueFamilyIndexCount];
+            memcpy(pQueueFamilyIndices, pCreateInfo->pQueueFamilyIndices, pCreateInfo->queueFamilyIndexCount*sizeof(uint32_t));
+            createInfo.pQueueFamilyIndices = pQueueFamilyIndices;
+        }
+    }
+    ~_SWAPCHAIN_NODE()
+    {
+        if (pQueueFamilyIndices)
+            delete pQueueFamilyIndices;
+    }
 } SWAPCHAIN_NODE;
-- 
2.7.4