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

Updates to SSA lifetime and UI changes related to shader base pointers

Browse Source 
Mark potential pointer bases as having no end lifetime (similar to global variables)

Do no make an out of scope change and an in scope change if the ID is in the old and new live lists (can happen for pointer base variables)
This commit is contained in:
Jake Turner
2025-11-27 07:51:07 +13:00
parent a9acee3106
commit 61bf255ea0
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/spirv_debug.cpp
+13 -6
View File
@@ -393,7 +393,7 @@ DeviceOpResult ThreadState::WritePointerValue(Id pointer, const ShaderVariable &
// Mark the pointer as being live
bool wasLive = SetLive(pointer);
bool baseWasLive = (pointer == ptrid) ? wasLive : true;
bool baseWasLive = (pointer == ptrid) ? wasLive : live.contains(ptrid);
rdcarray<ShaderVariableChange> changes;
rdcarray<Id> &pointers = pointersForId[ptrid];
@@ -497,13 +497,16 @@ DeviceOpResult ThreadState::WritePointerValue(Id pointer, const ShaderVariable &
includeBaseChange = true;
}
// if this is the first local write, mark this variable as becoming alive here, instead of at
// its declaration or if the variable wasn't live
if(firstLocalWrite || !baseWasLive)
basechange.before = {};
if(includeBaseChange)
{
// mark this variable as becoming alive here,
// if this is the first local write (instead of at its declaration)
if(firstLocalWrite)
basechange.before = {};
if(!baseWasLive)
basechange.before = {};
pendingDebugState.changes.push_back(basechange);
SetLive(ptrid);
}
@@ -634,6 +637,8 @@ void ThreadState::ProcessScopeChange(const rdcarray<Id> &oldLive, const rdcarray
{
if(liveGlobals.contains(id))
continue;
if(newLive.contains(id))
continue;
DeviceOpResult opResult = debugger.GetPointerValue(ids[id], val);
SPIRV_DEBUG_RDCASSERTEQUAL(opResult, DeviceOpResult::Succeeded);
@@ -652,6 +657,8 @@ void ThreadState::ProcessScopeChange(const rdcarray<Id> &oldLive, const rdcarray
{
if(liveGlobals.contains(id))
continue;
if(oldLive.contains(id))
continue;
DeviceOpResult opResult = debugger.GetPointerValue(ids[id], val);
SPIRV_DEBUG_RDCASSERTEQUAL(opResult, DeviceOpResult::Succeeded);
renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
+12
View File
@@ -4477,6 +4477,18 @@ void Debugger::RegisterOp(Iter it)
m_DebugInfo.valid = true;
}
}
else if((opdata.op == Op::AccessChain) || (opdata.op == Op::InBoundsAccessChain))
{
OpAccessChain chain(it);
// Base pointers never retire
idLiveRange[chain.base].second = ~0U;
}
else if((opdata.op == Op::PtrAccessChain) || (opdata.op == Op::InBoundsPtrAccessChain))
{
OpPtrAccessChain chain(it);
// Base pointers never retire
idLiveRange[chain.base].second = ~0U;
}
if(opdata.op == Op::Source)
{