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

Minor tidyup of SPIRV controlflow setup

Browse Source 
Use the first instruction as the starting point not the first block
This commit is contained in:
Jake Turner
2025-04-03 09:35:58 +01:00
parent 368db48054
commit d42d867be4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
+5 -5
View File
@@ -2471,7 +2471,7 @@ rdcarray<ShaderDebugState> Debugger::ContinueDebug()
if(steps == 0)
{
ShaderDebugState initial;
uint32_t startBlock = INVALID_EXECUTION_POINT;
uint32_t startPoint = INVALID_EXECUTION_POINT;
// we should be sitting at the entry point function prologue, step forward into the first block
// and past any function-local variable declarations
@@ -2484,7 +2484,7 @@ rdcarray<ShaderDebugState> Debugger::ContinueDebug()
thread.EnterEntryPoint(&initial);
FillCallstack(thread, initial);
initial.nextInstruction = thread.nextInstruction;
startBlock = thread.callstack.back()->curBlock.value();
startPoint = initial.nextInstruction;
}
else
{
@@ -2506,18 +2506,18 @@ rdcarray<ShaderDebugState> Debugger::ContinueDebug()
ret.push_back(std::move(initial));
// Set the initial block for the threads in the root tangle
// Set the initial execution point for the threads in the root tangle
ThreadExecutionStates threadExecutionStates;
TangleGroup &tangles = controlFlow.GetTangles();
RDCASSERTEQUAL(tangles.size(), 1);
RDCASSERTNOTEQUAL(startBlock, INVALID_EXECUTION_POINT);
RDCASSERTNOTEQUAL(startPoint, INVALID_EXECUTION_POINT);
for(Tangle &tangle : tangles)
{
RDCASSERT(tangle.IsAliveActive());
for(uint32_t threadIdx = 0; threadIdx < workgroup.size(); ++threadIdx)
{
if(!workgroup[threadIdx].Finished())
threadExecutionStates[threadIdx].push_back(startBlock);
threadExecutionStates[threadIdx].push_back(startPoint);
}
}
controlFlow.UpdateState(threadExecutionStates);