From 03dc6579a55465c9ac5b3464ef4ab0630649c5b3 Mon Sep 17 00:00:00 2001
From: Mark Lobodzinski <mark@lunarg.com>
Date: Mon, 28 Mar 2016 14:34:40 -0600
Subject: layers: Michael's fix for uninit'd data in FindLayout

Change-Id: Ia34d036e15a08c135cf3fb0ea4a80c12f2201ec7
---
 layers/core_validation.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'layers/core_validation.cpp')

diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 994efb17..950dd760 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -3673,7 +3673,9 @@ void SetLayout(GLOBAL_CB_NODE *pCB, ImageSubresourcePair imgpair, const VkImageL
         // TODO (mlentine): Could be expensive and might need to be removed.
         assert(imgpair.hasSubresource);
         IMAGE_CMD_BUF_LAYOUT_NODE node;
-        FindLayout(pCB, imgpair.image, imgpair.subresource, node);
+        if (!FindLayout(pCB, imgpair.image, imgpair.subresource, node)) {
+            node.initialLayout = layout;
+        }
         SetLayout(pCB, imgpair, {node.initialLayout, layout});
     }
 }
-- 
cgit v1.2.3