From 4a481edd32a0c6cbcece78b3852101237eb6cb03 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 20 May 2024 15:14:40 +0100
Subject: [PATCH] Tweak label naming to be more C-like and demangled

---
 .../driver/shaders/dxbc/dxbc_container.cpp    |  2 +-
 .../driver/shaders/dxil/dxil_disassemble.cpp  | 47 +++++++++++++------
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/renderdoc/driver/shaders/dxbc/dxbc_container.cpp b/renderdoc/driver/shaders/dxbc/dxbc_container.cpp
index 365e3e774..e39811b48 100644
--- a/renderdoc/driver/shaders/dxbc/dxbc_container.cpp
+++ b/renderdoc/driver/shaders/dxbc/dxbc_container.cpp
@@ -2311,7 +2311,7 @@ TEST_CASE("DO NOT COMMIT - convenience test", "[dxbc]")
 
   // the only thing fetched lazily is the disassembly, so grab that here
 
-  rdcstr disasm = container.GetDisassembly();
+  rdcstr disasm = container.GetDisassembly(false);
 
   RDCLOG("%s", disasm.c_str());
 }
diff --git a/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp b/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp
index f25fbe505..5743a1815 100644
--- a/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp
+++ b/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp
@@ -1051,11 +1051,22 @@ rdcstr Program::ArgToString(const Value *v, bool withTypes, const rdcstr &attrSt
     if(withTypes)
       ret = "label ";
     ret += attrString;
-    if(block->name.empty())
-      ret += StringFormat::Fmt("%c%u", DXIL::dxilIdentifier, block->slot);
+    if(DXIL::dxcStyleFormatting)
+    {
+      if(block->name.empty())
+        ret += StringFormat::Fmt("%c%u", DXIL::dxilIdentifier, block->slot);
+      else
+        ret += StringFormat::Fmt("%c%s", DXIL::dxilIdentifier,
+                                 escapeStringIfNeeded(block->name).c_str());
+    }
     else
-      ret +=
-          StringFormat::Fmt("%c%s", DXIL::dxilIdentifier, escapeStringIfNeeded(block->name).c_str());
+    {
+      if(block->name.empty())
+        ret += StringFormat::Fmt("%clabel%u", DXIL::dxilIdentifier, block->slot);
+      else
+        ret += StringFormat::Fmt("%clabel_%s%u", DXIL::dxilIdentifier,
+                                 DXBC::BasicDemangle(block->name).c_str(), block->id);
+    }
   }
   else
   {
@@ -4118,11 +4129,12 @@ void Program::MakeRDDisassemblyString(const DXBC::Reflection *reflection)
           rdcstr labelName;
 
           if(func.blocks[curBlock]->name.empty())
-            labelName = StringFormat::Fmt("; <label>:%c%u ", DXIL::dxilIdentifier,
-                                          func.blocks[curBlock]->slot);
+            labelName =
+                StringFormat::Fmt("%clabel%u: ", DXIL::dxilIdentifier, func.blocks[curBlock]->slot);
           else
-            labelName = StringFormat::Fmt("%c%s: ", DXIL::dxilIdentifier,
-                                          escapeStringIfNeeded(func.blocks[curBlock]->name).c_str());
+            labelName = StringFormat::Fmt("%clabel_%s%u: ", DXIL::dxilIdentifier,
+                                          DXBC::BasicDemangle(func.blocks[curBlock]->name).c_str(),
+                                          func.blocks[curBlock]->id);
 
           labelName.reserve(30);
           while(labelName.size() < 30)
@@ -4132,23 +4144,28 @@ void Program::MakeRDDisassemblyString(const DXBC::Reflection *reflection)
           bool first = true;
           for(const Block *pred : func.blocks[curBlock]->preds)
           {
-            if(!first)
-              predicates += ", ";
-            first = false;
             if(pred->name.empty())
             {
               // Ignore predicate 0
               if(pred->slot > 0)
-                predicates += StringFormat::Fmt("%c%u", DXIL::dxilIdentifier, pred->slot);
+              {
+                if(!first)
+                  predicates += ", ";
+                first = false;
+                predicates += StringFormat::Fmt("%clabel%u", DXIL::dxilIdentifier, pred->slot);
+              }
             }
             else
             {
-              predicates += StringFormat::Fmt("%c%s", DXIL::dxilIdentifier,
-                                              escapeStringIfNeeded(pred->name).c_str());
+              if(!first)
+                predicates += ", ";
+              first = false;
+              predicates += StringFormat::Fmt("%clabel_%s%u", DXIL::dxilIdentifier,
+                                              DXBC::BasicDemangle(pred->name).c_str(), pred->id);
             }
           }
           if(!predicates.empty())
-            labelName += "; preds = " + predicates;
+            labelName += "// preceeded by " + predicates;
 
           m_Disassembly += labelName;
           DisassemblyAddNewLine();