From e78aec6d362a6f100d9a47ff7dcef5a2f4415d64 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 14 Apr 2020 15:59:34 +0100
Subject: [PATCH] Don't add extra prefix on constant buffer array variables.
 Closes #1828

---
 renderdoc/driver/shaders/dxbc/dxbc_debug.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp b/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp
index 213dfad8e..17add510d 100644
--- a/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp
+++ b/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp
@@ -4334,7 +4334,7 @@ void AddCBufferToGlobalState(const DXBCBytecode::Program &program, GlobalState &
         // individual elements of the constant buffer. For CB arrays, add an extra source
         // var for the CB array index
         SourceVariableMapping cbArrayMapping;
-        global.constantBlocks[i].members[arrayIndex].name = identifierPrefix;
+        global.constantBlocks[i].members[arrayIndex].name = StringFormat::Fmt("[%u]", arrayIndex);
         cbArrayMapping.name = variablePrefix;
         cbArrayMapping.variables.push_back(
             DebugVariableReference(DebugVariableType::Constant, identifierPrefix));