From 017d4ee104783a1ac5a848d7726307b05749927f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20St=C3=BCdemann?= <kstuedem@hs-mittweida.de>
Date: Fri, 25 Nov 2016 20:20:36 +0100
Subject: [PATCH] fixed InstanceID getting added to debug SPIR-V shader with
 invalid type

---
 renderdoc/driver/vulkan/vk_debug.cpp | 73 ++++++++++++++--------------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp
index 93d2e76ce..10ea4d061 100644
--- a/renderdoc/driver/vulkan/vk_debug.cpp
+++ b/renderdoc/driver/vulkan/vk_debug.cpp
@@ -7231,45 +7231,45 @@ static void AddOutputDumping(const ShaderReflection &refl, const char *entryName
     outs[i].childIdx = refl.OutputSig[i].semanticIndex;
   }
 
+  // if needed add new ID for sint32 type
+  if(sint32ID == 0)
+  {
+    sint32ID = idBound++;
+
+    uint32_t typeOp[] = {
+        MakeSPIRVOp(spv::OpTypeInt, 4), sint32ID,
+        32U,    // 32-bit
+        1U,     // signed
+    };
+
+    // insert at the end of the types/variables section
+    modSpirv.insert(modSpirv.begin() + typeVarOffset, typeOp, typeOp + ARRAY_COUNT(typeOp));
+
+    // update offsets to account for inserted op
+    typeVarOffset += ARRAY_COUNT(typeOp);
+  }
+
+  // if needed, new ID for input ptr type
+  if(sint32PtrInID == 0 && (vertidxID == 0 || instidxID == 0))
+  {
+    sint32PtrInID = idBound;
+    idBound++;
+
+    uint32_t typeOp[] = {
+        MakeSPIRVOp(spv::OpTypePointer, 4), sint32PtrInID, spv::StorageClassInput, sint32ID,
+    };
+
+    // insert at the end of the types/variables section
+    modSpirv.insert(modSpirv.begin() + typeVarOffset, typeOp, typeOp + ARRAY_COUNT(typeOp));
+
+    // update offsets to account for inserted op
+    typeVarOffset += ARRAY_COUNT(typeOp);
+  }
+
   if(vertidxID == 0)
   {
     // need to declare our own "in int gl_VertexID;"
 
-    // if needed add new ID for sint32 type
-    if(sint32ID == 0)
-    {
-      sint32ID = idBound++;
-
-      uint32_t typeOp[] = {
-          MakeSPIRVOp(spv::OpTypeInt, 4), sint32ID,
-          32U,    // 32-bit
-          1U,     // signed
-      };
-
-      // insert at the end of the types/variables section
-      modSpirv.insert(modSpirv.begin() + typeVarOffset, typeOp, typeOp + ARRAY_COUNT(typeOp));
-
-      // update offsets to account for inserted op
-      typeVarOffset += ARRAY_COUNT(typeOp);
-    }
-
-    // if needed, new ID for input ptr type
-    if(sint32PtrInID == 0)
-    {
-      sint32PtrInID = idBound;
-      idBound++;
-
-      uint32_t typeOp[] = {
-          MakeSPIRVOp(spv::OpTypePointer, 4), sint32PtrInID, spv::StorageClassInput, sint32ID,
-      };
-
-      // insert at the end of the types/variables section
-      modSpirv.insert(modSpirv.begin() + typeVarOffset, typeOp, typeOp + ARRAY_COUNT(typeOp));
-
-      // update offsets to account for inserted op
-      typeVarOffset += ARRAY_COUNT(typeOp);
-    }
-
     // new ID for vertex index
     vertidxID = idBound;
     idBound++;
@@ -7312,8 +7312,7 @@ static void AddOutputDumping(const ShaderReflection &refl, const char *entryName
 
   if(instidxID == 0)
   {
-    // we can assume that after vertxidxID was added above, that the types
-    // are available. We just have to add the actual instance id variable
+    // need to declare our own "in int gl_InstanceID;"
 
     // new ID for vertex index
     instidxID = idBound;