From fc1e5bb1ad8c3b95abd2da8f6ec08eada975f636 Mon Sep 17 00:00:00 2001
From: Jake Turner <jake@evansturner.co.uk>
Date: Thu, 13 Jun 2024 10:19:50 +0100
Subject: [PATCH] DXIL Disassembly use RD variable type output in
 AnnotateHandle

i.e.
Texture2D<4xF32> -> Texture2D<float4>
---
 renderdoc/driver/shaders/dxil/dxil_disassemble.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp b/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp
index 4559fd785..bdf724766 100644
--- a/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp
+++ b/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp
@@ -3251,10 +3251,12 @@ void Program::MakeRDDisassemblyString(const DXBC::Reflection *reflection)
                             resKind == ResourceKind::Texture2DMS ||
                             resKind == ResourceKind::Texture2DMSArray)
                     {
+                      VarType varType = VarTypeForComponentType(compType);
                       typeStr += "<";
+                      typeStr += ToStr(varType);
                       if(compCount > 1)
-                        typeStr += StringFormat::Fmt("%dx", compCount);
-                      typeStr += StringFormat::Fmt("%s>", ToStr(compType).c_str());
+                        typeStr += StringFormat::Fmt("%d", compCount);
+                      typeStr += ">";
                     }
                     lineStr += "(";
                     lineStr += typeStr;