From 36a67611e5bf9072005d27abecdade08afd2e2b1 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 6 Aug 2014 22:35:47 +0100
Subject: [PATCH] Handle a few declaration opcodes that had gotten missed

---
 renderdoc/driver/d3d11/shaders/dxbc_disassemble.cpp | 8 +++++---
 renderdoc/driver/d3d11/shaders/dxbc_disassemble.h   | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/renderdoc/driver/d3d11/shaders/dxbc_disassemble.cpp b/renderdoc/driver/d3d11/shaders/dxbc_disassemble.cpp
index ba88d473f..2f87b9fc6 100644
--- a/renderdoc/driver/d3d11/shaders/dxbc_disassemble.cpp
+++ b/renderdoc/driver/d3d11/shaders/dxbc_disassemble.cpp
@@ -1149,7 +1149,7 @@ bool DXBCFile::ExtractDecl(uint32_t *&tokenStream, ASMDecl &retDecl)
 	}
 	else if(op == OPCODE_DCL_INPUT_SIV || op == OPCODE_DCL_INPUT_SGV ||
 			op == OPCODE_DCL_INPUT_PS_SIV || op == OPCODE_DCL_INPUT_PS_SGV ||
-			op == OPCODE_DCL_OUTPUT_SIV)
+			op == OPCODE_DCL_OUTPUT_SIV || op == OPCODE_DCL_OUTPUT_SGV)
 	{
 		bool ret = ExtractOperand(tokenStream, retDecl.operand);
 		RDCASSERT(ret);
@@ -1503,9 +1503,11 @@ bool DXBCFile::ExtractDecl(uint32_t *&tokenStream, ASMDecl &retDecl)
 
 		retDecl.str += retDecl.operand.toString(false);
 	}
-	else if(op == OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT)
+	else if(op == OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT ||
+					op == OPCODE_DCL_HS_JOIN_PHASE_INSTANCE_COUNT ||
+					op == OPCODE_DCL_GS_INSTANCE_COUNT)
 	{
-		retDecl.forkInstanceCount = tokenStream[0];
+		retDecl.instanceCount = tokenStream[0];
 		tokenStream++;
 		
 		retDecl.str += " ";
diff --git a/renderdoc/driver/d3d11/shaders/dxbc_disassemble.h b/renderdoc/driver/d3d11/shaders/dxbc_disassemble.h
index 63b0f2e6b..5fd63ee7b 100644
--- a/renderdoc/driver/d3d11/shaders/dxbc_disassemble.h
+++ b/renderdoc/driver/d3d11/shaders/dxbc_disassemble.h
@@ -791,7 +791,9 @@ struct ASMDecl
 	PrimitiveTopology outTopology;
 
 	// OPCODE_DCL_HS_FORK_PHASE_INSTANCE_COUNT
-	uint32_t forkInstanceCount;
+	// OPCODE_DCL_HS_JOIN_PHASE_INSTANCE_COUNT
+	// OPCODE_DCL_GS_INSTANCE_COUNT
+	uint32_t instanceCount;
 
 	// OPCODE_DCL_INDEX_RANGE
 	uint32_t indexRange;