lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-26 11:50:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the UI debug state after all lanes have executed and skipped nops

Browse Source 
This keeps UI nextInstruction in sync with m_ActiveGlobalInstructionIdx
This commit is contained in:
Jake Turner
2024-12-18 13:59:20 +00:00
parent f6829299ba
commit 141b86ac70
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/dxil/dxil_debug.cpp
+11 -11
View File
@@ -5285,9 +5285,6 @@ void ThreadState::StepNext(ShaderDebugState *state, DebugAPIWrapper *apiWrapper,
RDCASSERTEQUAL(m_ActiveGlobalInstructionIdx, m_GlobalInstructionIdx);
if(m_State)
{
if(!m_Ended)
m_State->nextInstruction = m_GlobalInstructionIdx + 1;
m_State->flags = ShaderEvents::NoEvent;
m_State->changes.clear();
@@ -5320,9 +5317,6 @@ void ThreadState::StepNext(ShaderDebugState *state, DebugAPIWrapper *apiWrapper,
}
ExecuteInstruction(apiWrapper, workgroups);
if(m_State && m_Ended)
--m_State->nextInstruction;
m_State = NULL;
}
@@ -7947,6 +7941,8 @@ rdcarray<ShaderDebugState> Debugger::ContinueDebug(DebugAPIWrapper *apiWrapper)
CalcActiveMask(activeMask);
// step all active members of the workgroup
ShaderDebugState state;
bool hasDebugState = false;
for(size_t lane = 0; lane < m_Workgroups.size(); lane++)
{
if(activeMask[lane])
@@ -7961,13 +7957,9 @@ rdcarray<ShaderDebugState> Debugger::ContinueDebug(DebugAPIWrapper *apiWrapper)
if(lane == m_ActiveLaneIndex)
{
ShaderDebugState state;
hasDebugState = true;
state.stepIndex = m_Steps;
thread.StepNext(&state, apiWrapper, m_Workgroups);
thread.FillCallstack(state);
ret.push_back(std::move(state));
m_Steps++;
}
else
@@ -7981,6 +7973,14 @@ rdcarray<ShaderDebugState> Debugger::ContinueDebug(DebugAPIWrapper *apiWrapper)
if(activeMask[lane])
m_Workgroups[lane].StepOverNopInstructions();
}
// Update UI state after the execute and step over nops to make sure state.nextInstruction is in sync
if(hasDebugState)
{
ThreadState &thread = m_Workgroups[m_ActiveLaneIndex];
state.nextInstruction = thread.m_ActiveGlobalInstructionIdx;
thread.FillCallstack(state);
ret.push_back(std::move(state));
}
}
return ret;
}