lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 18:10:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cache DXIL SSA ID Result names

Browse Source 
The disassembly will populate the cache and the debugger will reuse the cache
This commit is contained in:
Jake Turner
2025-09-26 06:44:32 +01:00
parent 99b3137b41
commit 34a8af762b
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/dxil/dxil_bytecode.h
+2 -1
View File
@@ -1729,7 +1729,7 @@ protected:
const ResourceReference *GetResourceReference(const DXILDebug::Id handleId) const;
rdcstr GetHandleAlias(const rdcstr &handleStr) const;
static DXILDebug::Id GetResultSSAId(const DXIL::Instruction &inst);
static void MakeResultId(const Instruction &inst, rdcstr &resultId);
void MakeResultId(const Instruction &inst, rdcstr &resultId) const;
rdcstr GetArgId(const Instruction &inst, uint32_t arg) const;
rdcstr GetArgId(const Value *v) const;
rdcstr GetArgumentName(const Value *v) const;
@@ -1808,6 +1808,7 @@ protected:
std::map<rdcstr, rdcstr> m_SsaAliases;
std::map<rdcstr, uint32_t> m_ResourceAnnotateCounts;
rdcarray<LocalSourceVariable> m_Locals;
mutable std::map<DXILDebug::Id, rdcstr> m_ResultNames;
rdcarray<ResourceReference> m_ResourceReferences;
rdcstr m_Disassembly;
renderdoc/driver/shaders/dxil/dxil_debug.cpp
+1 -1
View File
@@ -2088,7 +2088,7 @@ bool ThreadState::ExecuteInstruction(const rdcarray<ThreadState> &workgroup,
const Type *retType = inst.type;
// Sensible defaults
ShaderVariable result;
Program::MakeResultId(inst, result.name);
m_Program.MakeResultId(inst, result.name);
result.rows = 1;
result.columns = 1;
result.type = ConvertDXILTypeToVarType(retType);
renderdoc/driver/shaders/dxil/dxil_disassemble.cpp
+19 -5
View File
@@ -6246,12 +6246,26 @@ DXILDebug::Id Program::GetResultSSAId(const DXIL::Instruction &inst)
return inst.slot;
}
void Program::MakeResultId(const DXIL::Instruction &inst, rdcstr &resultId)
void Program::MakeResultId(const DXIL::Instruction &inst, rdcstr &resultId) const
{
DXILDebug::Id id = inst.slot;
if(id != ~0U)
{
auto it = m_ResultNames.find(id);
if(it != m_ResultNames.end())
{
resultId = it->second;
return;
}
}
if(!inst.getName().empty())
resultId = StringFormat::Fmt("%c%s", '_', escapeStringIfNeeded(inst.getName()).c_str());
else if(inst.slot != ~0U)
resultId = StringFormat::Fmt("%c%s", '_', ToStr(inst.slot).c_str());
resultId = StringFormat::Fmt("_%s", escapeStringIfNeeded(inst.getName()).c_str());
else if(id != ~0U)
resultId = StringFormat::Fmt("_%s", ToStr(id).c_str());
if(id != ~0U)
m_ResultNames[id] = resultId;
}
rdcpair<int32_t, int32_t> Program::ParseDIExpressionMD(const Metadata *expressionMD) const
@@ -6328,7 +6342,7 @@ SourceMappingInfo Program::ParseDbgOpDeclare(const DXIL::Instruction &inst) cons
if(const Instruction *varInst = cast<Instruction>(value))
{
ret.dbgVarId = Program::GetResultSSAId(*varInst);
Program::MakeResultId(*varInst, ret.dbgVarName);
MakeResultId(*varInst, ret.dbgVarName);
}
else if(const GlobalVar *gv = cast<GlobalVar>(value))
{