From c84cba4b880fc9cb4ddb2f6c5c7f9d46a9e0753a Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 4 Apr 2018 15:57:43 +0100
Subject: [PATCH] Use proper constant IDs instead of relying on output constID

---
 renderdoc/driver/vulkan/vk_postvs.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/renderdoc/driver/vulkan/vk_postvs.cpp b/renderdoc/driver/vulkan/vk_postvs.cpp
index 104bca4c7..08d075dc3 100644
--- a/renderdoc/driver/vulkan/vk_postvs.cpp
+++ b/renderdoc/driver/vulkan/vk_postvs.cpp
@@ -933,7 +933,12 @@ static void ConvertToMeshOutputCompute(const ShaderReflection &refl, const SPIRV
           std::vector<uint32_t> words = {outs[o].privatePtrID, readPtr, patchData.outputs[o].ID};
 
           for(uint32_t idx : patchData.outputs[o].accessChain)
-            words.push_back(outs[idx].constID);
+          {
+            if(idxs[idx] == 0)
+              idxs[idx] = editor.AddConstantImmediate<uint32_t>(idx);
+
+            words.push_back(idxs[idx]);
+          }
 
           // type *readPtr = globalvar.globalsub...;
           ops.push_back(SPIRVOperation(spv::OpAccessChain, words));