From d73452f01245889ce01a2b5829fb64a6828fa252 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 10 Jun 2020 14:35:55 +0100 Subject: [PATCH] Print metadata values inline instead of referencing them by number --- renderdoc/driver/shaders/dxil/dxil_disassemble.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp b/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp index 57435e9f3..3899a2100 100644 --- a/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp +++ b/renderdoc/driver/shaders/dxil/dxil_disassemble.cpp @@ -412,10 +412,13 @@ void Program::MakeDisassemblyString() if(s.idx < m_Metadata.size()) { Metadata &m = m_Metadata[s.idx]; - if(m.value && m.val && m.val->nullconst) - ret += StringFormat::Fmt("%s zeroinitializer", m.val->type->toString()); - else if(m.value && m.val && m.val->symbol) - ret += m.val->toString(true); + if(m.value && m.val && m.val->symbol) + ret += m.val->toString(withTypes); + else if(m.value && m.val && m.val->type->type == Type::Scalar) + ret += m.val->toString(withTypes); + else if(m.value && m.val && m.val->nullconst) + ret += withTypes ? StringFormat::Fmt("%s zeroinitializer", m.val->type->toString()) + : "zeroinitializer"; else ret += StringFormat::Fmt("!%u", GetOrAssignMetaID(&m)); }