lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-05 13:25:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use OpLine information for SPIR-V debugging

Browse Source
This commit is contained in:
baldurk
2020-05-25 19:29:16 +01:00
parent 45d15596de
commit 3ee0ddca1a
2 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/spirv_debug.h
+4
View File
@@ -343,6 +343,10 @@ private:
SparseIdMap<size_t> idDeathOffset;
SparseIdMap<size_t> m_Files;
LineColumnInfo m_CurLineCol;
std::map<size_t, LineColumnInfo> m_LineColInfo;
SparseIdMap<uint32_t> labelInstruction;
// the live mutable global variables, to initialise a stack frame's live list
renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
+34 -7
View File
@@ -962,11 +962,15 @@ ShaderDebugTrace *Debugger::BeginDebug(DebugAPIWrapper *apiWrapper, const Shader
ret->lineInfo.resize(instructionOffsets.size());
for(size_t i = 0; i < instructionOffsets.size(); i++)
{
auto it = instructionLines.find(instructionOffsets[i]);
if(it != instructionLines.end())
ret->lineInfo[i].disassemblyLine = it->second;
else
ret->lineInfo[i].disassemblyLine = 0;
ret->lineInfo[i] = m_LineColInfo[instructionOffsets[i]];
{
auto it = instructionLines.find(instructionOffsets[i]);
if(it != instructionLines.end())
ret->lineInfo[i].disassemblyLine = it->second;
else
ret->lineInfo[i].disassemblyLine = 0;
}
}
ret->constantBlocks = global.constantBlocks;
@@ -2193,10 +2197,33 @@ void Debugger::RegisterOp(Iter it)
}
}
if(opdata.op == Op::Line || opdata.op == Op::NoLine)
if(opdata.op == Op::Source)
{
// ignore OpLine/OpNoLine
OpSource source(it);
if(!source.source.empty())
{
m_Files[source.file] = m_Files.size();
}
}
else if(opdata.op == Op::Line)
{
OpLine line(it);
m_CurLineCol.lineStart = line.line;
m_CurLineCol.lineEnd = line.line;
m_CurLineCol.colStart = line.column;
m_CurLineCol.fileIndex = (int32_t)m_Files[line.file];
}
else if(opdata.op == Op::NoLine)
{
m_CurLineCol = LineColumnInfo();
}
else
{
m_LineColInfo[it.offs()] = m_CurLineCol;
}
if(opdata.op == Op::String)
{
OpString string(it);