From edcc7f7bbf86f476bea6f829a403128500937434 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 22 Apr 2024 16:12:06 +0100 Subject: [PATCH] Fix a couple of differences from dxc disassembly --- renderdoc/driver/shaders/dxil/dxil_disassemble.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp b/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp index 3894dc898..0facc1133 100644 --- a/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp +++ b/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp @@ -709,12 +709,12 @@ rdcstr Program::DisassembleTypes(int &instructionLine) const if(typ->type == Type::Struct && !typ->name.empty()) { rdcstr name = typ->toString(); - ret += StringFormat::Fmt("%s = type {", name.c_str()); + ret += StringFormat::Fmt("%s = type { ", name.c_str()); bool first = true; for(const Type *t : typ->members) { if(!first) - ret += ","; + ret += ", "; first = false; ret += StringFormat::Fmt("%s", t->toString().c_str()); } @@ -1821,7 +1821,8 @@ void Program::MakeDXCDisassemblyString() m_Disassembly += DisassembleNamedMeta(); m_Disassembly += DisassembleMeta(); - m_Disassembly += "\n"; + if(m_Disassembly.back() != '\n') + m_Disassembly += "\n"; } void Program::MakeRDDisassemblyString()