From 38cb1d796ad2ad9060e7e4b926d65c51088f7852 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 5 May 2016 16:11:43 +0200
Subject: [PATCH] Use the right (updated during reading) set of descriptor sets

---
 renderdoc/driver/vulkan/vk_core.cpp | 5 +++--
 renderdoc/driver/vulkan/vk_core.h   | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp
index 3700de067..9c353cb79 100644
--- a/renderdoc/driver/vulkan/vk_core.cpp
+++ b/renderdoc/driver/vulkan/vk_core.cpp
@@ -2421,7 +2421,8 @@ void WrappedVulkan::AddUsage(VulkanDrawcallTreeNode &drawNode)
 		if(sh.module == ResourceId()) continue;
 
 		// 5 is the compute shader's index (VS, TCS, TES, GS, FS, CS)
-		const vector<ResourceId> &descSets = (shad == 5 ? state.computeDescSets : state.graphicsDescSets);
+		const vector<VulkanRenderState::Pipeline::DescriptorAndOffsets> &descSets =
+			(shad == 5 ? m_RenderState.compute.descSets : m_RenderState.graphics.descSets);
 
 		RDCASSERT(sh.mapping);
 
@@ -2457,7 +2458,7 @@ void WrappedVulkan::AddUsage(VulkanDrawcallTreeNode &drawNode)
 					continue;
 				}
 				
-				DescriptorSetInfo &descset = m_DescriptorSetState[ descSets[bindset] ];
+				DescriptorSetInfo &descset = m_DescriptorSetState[ descSets[bindset].descSet ];
 				DescSetLayout &layout = c.m_DescSetLayout[ descset.layout ];
 
 				if(layout.bindings.empty())
diff --git a/renderdoc/driver/vulkan/vk_core.h b/renderdoc/driver/vulkan/vk_core.h
index 61d769640..ad0c9df04 100644
--- a/renderdoc/driver/vulkan/vk_core.h
+++ b/renderdoc/driver/vulkan/vk_core.h
@@ -327,8 +327,6 @@ private:
 		struct CmdBufferState
 		{
 			ResourceId pipeline;
-			vector<ResourceId> graphicsDescSets;
-			vector<ResourceId> computeDescSets;
 
 			uint32_t idxWidth;
 			ResourceId ibuffer;