From 41eb7483cc974a7872670b8433a061a055e83014 Mon Sep 17 00:00:00 2001
From: Jake Turner <jake@evansturner.co.uk>
Date: Thu, 8 May 2025 10:25:00 +0100
Subject: [PATCH] Match disassembly SSA ID names for annotated resource handles

---
 renderdoc/driver/shaders/dxil/dxil_debug.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/renderdoc/driver/shaders/dxil/dxil_debug.cpp b/renderdoc/driver/shaders/dxil/dxil_debug.cpp
index 0fbd2a23b..ad927c63e 100644
--- a/renderdoc/driver/shaders/dxil/dxil_debug.cpp
+++ b/renderdoc/driver/shaders/dxil/dxil_debug.cpp
@@ -2403,8 +2403,10 @@ bool ThreadState::ExecuteInstruction(DebugAPIWrapper *apiWrapper,
             {
               resName = m_Program.GetHandleAlias(baseResource);
             }
+            // Use the handle alias of the result SSA ID to match the disassembly
+            rdcstr handleAlias = m_Program.GetHandleAlias(result.name);
             result = resource;
-            result.name = resName;
+            result.name = handleAlias;
 
             // Parse the packed annotate handle properties
             // resKind : {compType, compCount} | {structStride}