From 60a1950b1692a444da589514bd1ebf94a00c0e72 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 9 Feb 2017 16:29:15 +0000
Subject: [PATCH] Fetch image/resource layouts from pipeline state data

---
 qrenderdoc/Code/CommonPipelineState.cpp | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/qrenderdoc/Code/CommonPipelineState.cpp b/qrenderdoc/Code/CommonPipelineState.cpp
index 6d3cc25a9..b35cde4e6 100644
--- a/qrenderdoc/Code/CommonPipelineState.cpp
+++ b/qrenderdoc/Code/CommonPipelineState.cpp
@@ -23,19 +23,30 @@
  ******************************************************************************/
 
 #include "CommonPipelineState.h"
+#include "QRDUtils.h"
 
 QString CommonPipelineState::GetImageLayout(ResourceId id)
 {
-  /*
-  if (LogLoaded)
+  if(LogLoaded())
   {
-    if (IsLogVK && m_Vulkan->Images.ContainsKey(id))
-      return m_Vulkan->Images[id].layouts[0].name;
+    if(IsLogVK())
+    {
+      for(const VulkanPipelineState::ImageData &i : m_Vulkan->images)
+      {
+        if(i.image == id)
+          return ToQStr(i.layouts[0].name);
+      }
+    }
 
-    if (IsLogD3D12 && m_D3D12->Resources.ContainsKey(id))
-      return m_D3D12->Resources[id].states[0].name;
+    if(IsLogD3D12())
+    {
+      for(const D3D12PipelineState::ResourceData &r : m_D3D12->Resources)
+      {
+        if(r.id == id)
+          return ToQStr(r.states[0].name);
+      }
+    }
   }
-  */
 
   return "Unknown";
 }