From: Chris Forbes <chrisforbes@google.com>
Date: Tue, 28 Feb 2017 05:46:44 +0000 (+1300)
Subject: layers: remove attachment_first_layout tracking
X-Git-Tag: upstream/1.1.92~1514
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e40c3b4c5148834ba7763a991bbe26b3b45a8a9;p=platform%2Fupstream%2FVulkan-Tools.git

layers: remove attachment_first_layout tracking

Nothing uses this.

Signed-off-by: Chris Forbes <chrisforbes@google.com>
---

diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 1c9ab86..7ea6847 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -9265,14 +9265,12 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateRenderPass(VkDevice device, const VkRenderP
 
         // TODO: Maybe fill list and then copy instead of locking
         std::unordered_map<uint32_t, bool> &attachment_first_read = render_pass->attachment_first_read;
-        std::unordered_map<uint32_t, VkImageLayout> &attachment_first_layout = render_pass->attachment_first_layout;
         for (uint32_t i = 0; i < pCreateInfo->subpassCount; ++i) {
             const VkSubpassDescription &subpass = pCreateInfo->pSubpasses[i];
             for (uint32_t j = 0; j < subpass.colorAttachmentCount; ++j) {
                 uint32_t attachment = subpass.pColorAttachments[j].attachment;
                 if (!attachment_first_read.count(attachment)) {
                     attachment_first_read.insert(std::make_pair(attachment, false));
-                    attachment_first_layout.insert(std::make_pair(attachment, subpass.pColorAttachments[j].layout));
                 }
 
                 if (subpass.pResolveAttachments && subpass.pResolveAttachments[j].attachment != VK_ATTACHMENT_UNUSED) {
@@ -9280,7 +9278,6 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateRenderPass(VkDevice device, const VkRenderP
                     attachment = subpass.pResolveAttachments[j].attachment;
                     if (!attachment_first_read.count(attachment)) {
                         attachment_first_read.insert(std::make_pair(attachment, false));
-                        attachment_first_layout.insert(std::make_pair(attachment, subpass.pResolveAttachments[j].layout));
                     }
                 }
             }
@@ -9288,14 +9285,12 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateRenderPass(VkDevice device, const VkRenderP
                 uint32_t attachment = subpass.pDepthStencilAttachment->attachment;
                 if (!attachment_first_read.count(attachment)) {
                     attachment_first_read.insert(std::make_pair(attachment, false));
-                    attachment_first_layout.insert(std::make_pair(attachment, subpass.pDepthStencilAttachment->layout));
                 }
             }
             for (uint32_t j = 0; j < subpass.inputAttachmentCount; ++j) {
                 uint32_t attachment = subpass.pInputAttachments[j].attachment;
                 if (!attachment_first_read.count(attachment)) {
                     attachment_first_read.insert(std::make_pair(attachment, true));
-                    attachment_first_layout.insert(std::make_pair(attachment, subpass.pInputAttachments[j].layout));
                 }
             }
         }
diff --git a/layers/core_validation_types.h b/layers/core_validation_types.h
index 9f27acc..3215593 100644
--- a/layers/core_validation_types.h
+++ b/layers/core_validation_types.h
@@ -360,7 +360,6 @@ struct RENDER_PASS_STATE : public BASE_NODE {
     std::vector<bool> hasSelfDependency;
     std::vector<DAGNode> subpassToNode;
     std::unordered_map<uint32_t, bool> attachment_first_read;
-    std::unordered_map<uint32_t, VkImageLayout> attachment_first_layout;
 
     RENDER_PASS_STATE(VkRenderPassCreateInfo const *pCreateInfo) : createInfo(pCreateInfo) {}
 };