From a71c929538a0f8f4b95ebe1f861350f8ecf5d19f Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 21 Sep 2015 17:03:34 +0200
Subject: [PATCH] Fix fetching IDs for recording transitions

---
 renderdoc/driver/vulkan/vk_manager.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/renderdoc/driver/vulkan/vk_manager.cpp b/renderdoc/driver/vulkan/vk_manager.cpp
index 6ee0a60a8..0a0358926 100644
--- a/renderdoc/driver/vulkan/vk_manager.cpp
+++ b/renderdoc/driver/vulkan/vk_manager.cpp
@@ -60,7 +60,7 @@ void VulkanResourceManager::RecordTransitions(vector< pair<ResourceId, ImageRegi
 	{
 		const VkImageMemoryBarrier &t = transitions[ti];
 		
-		ResourceId id = GetResID(t.image);
+		ResourceId id = GetNonDispWrapper(t.image)->id;
 		
 		uint32_t nummips = t.subresourceRange.mipLevels;
 		uint32_t numslices = t.subresourceRange.arraySize;
@@ -279,6 +279,14 @@ void VulkanResourceManager::ApplyTransitions(vector< pair<ResourceId, ImageRegio
 
 		TRDBG("Applying transition to %llu", GetOriginalID(id));
 
+		auto stit = states.find(id);
+
+		if(stit == states.end())
+		{
+			TRDBG("Didn't find ID in image states");
+			continue;
+		}
+
 		uint32_t nummips = t.range.mipLevels;
 		uint32_t numslices = t.range.arraySize;
 		if(nummips == VK_LAST_MIP_LEVEL) nummips = states[id].mipLevels;
@@ -290,16 +298,12 @@ void VulkanResourceManager::ApplyTransitions(vector< pair<ResourceId, ImageRegio
 
 		if(t.prevstate == t.state) continue;
 
-		auto stit = states.find(id);
-
 		TRDBG("Transition of %s (%u->%u, %u->%u) from %s to %s",
 				ToStr::Get(t.range.aspect).c_str(),
 				t.range.baseMipLevel, t.range.mipLevels,
 				t.range.baseArraySlice, t.range.arraySize,
 				ToStr::Get(t.prevstate).c_str(), ToStr::Get(t.state).c_str());
 
-		if(stit == states.end()) continue;
-
 		bool done = false;
 
 		TRDBG("Matching image has %u subresource states", stit->second.subresourceStates.size());