From 2dcb0d0364231676758f81a47e871243a35f5046 Mon Sep 17 00:00:00 2001
From: Jake Turner <jake@evansturner.co.uk>
Date: Sat, 11 May 2024 07:05:02 +0100
Subject: [PATCH] RD DXIL Disassembly: tweaks to label formatting

Add the DXIL::Identifier before labels for consistency
Do not display predicate "_0"
Change predicate column to 30 instead of 50
---
 .../driver/shaders/dxil/dxil_disassemble.cpp  | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp b/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp
index 34befcb96..104f772b1 100644
--- a/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp
+++ b/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp
@@ -3959,28 +3959,37 @@ void Program::MakeRDDisassemblyString(const DXBC::Reflection *reflection)
           rdcstr labelName;
 
           if(func.blocks[curBlock]->name.empty())
-            labelName = StringFormat::Fmt("; <label>:%u", func.blocks[curBlock]->slot);
+            labelName = StringFormat::Fmt("; <label>:%c%u ", DXIL::dxilIdentifier,
+                                          func.blocks[curBlock]->slot);
           else
-            labelName =
-                StringFormat::Fmt("%s: ", escapeStringIfNeeded(func.blocks[curBlock]->name).c_str());
+            labelName = StringFormat::Fmt("%c%s: ", DXIL::dxilIdentifier,
+                                          escapeStringIfNeeded(func.blocks[curBlock]->name).c_str());
 
-          labelName.reserve(50);
-          while(labelName.size() < 50)
+          labelName.reserve(30);
+          while(labelName.size() < 30)
             labelName.push_back(' ');
 
-          labelName += "; preds = ";
+          rdcstr predicates;
           bool first = true;
           for(const Block *pred : func.blocks[curBlock]->preds)
           {
             if(!first)
-              labelName += ", ";
+              predicates += ", ";
             first = false;
             if(pred->name.empty())
-              labelName += StringFormat::Fmt("%c%u", DXIL::dxilIdentifier, pred->slot);
+            {
+              // Ignore predicate 0
+              if(pred->slot > 0)
+                predicates += StringFormat::Fmt("%c%u", DXIL::dxilIdentifier, pred->slot);
+            }
             else
-              labelName += StringFormat::Fmt("%c%s", DXIL::dxilIdentifier,
-                                             escapeStringIfNeeded(pred->name).c_str());
+            {
+              predicates += StringFormat::Fmt("%c%s", DXIL::dxilIdentifier,
+                                              escapeStringIfNeeded(pred->name).c_str());
+            }
           }
+          if(!predicates.empty())
+            labelName += "; preds = " + predicates;
 
           m_Disassembly += labelName;
           DisassemblyAddNewLine();