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

AtomicStore, Atomic* fixes

Browse Source 
Use the allocation size of the pointer argument not the allocation size of the memory backing variable (stack or global)

For Atomic* operations:
* use the pointer argument as the variable input instead of the memory backing variable (static or global)
* copy just the res value into the result variable instead of the whole res variable
* use the pointer argument variable as the source pointer argument instead of the memory backing variable
* record changes to the pointer argument variable as well as to the memory backing variable
This commit is contained in:
Jake Turner
2024-12-19 16:44:38 +00:00
parent 2759ebff97
commit 2aaac27f75
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/dxil/dxil_debug.cpp
+23 -10
View File
@@ -4155,11 +4155,11 @@ bool ThreadState::ExecuteInstruction(DebugAPIWrapper *apiWrapper,
const MemoryTracking::AllocPointer &ptr = itPtr->second;
baseMemoryId = ptr.baseMemoryId;
baseMemoryBackingPtr = ptr.backingMemory;
allocSize = ptr.size;
auto itAlloc = m_Memory.m_Allocs.find(baseMemoryId);
RDCASSERT(itAlloc != m_Memory.m_Allocs.end());
const MemoryTracking::Alloc &alloc = itAlloc->second;
allocSize = alloc.size;
allocMemoryBackingPtr = alloc.backingMemory;
RDCASSERT(baseMemoryBackingPtr);
@@ -5124,11 +5124,11 @@ bool ThreadState::ExecuteInstruction(DebugAPIWrapper *apiWrapper,
const MemoryTracking::AllocPointer &ptr = itPtr->second;
baseMemoryId = ptr.baseMemoryId;
baseMemoryBackingPtr = ptr.backingMemory;
allocSize = ptr.size;
auto itAlloc = m_Memory.m_Allocs.find(baseMemoryId);
RDCASSERT(itAlloc != m_Memory.m_Allocs.end());
const MemoryTracking::Alloc &alloc = itAlloc->second;
allocSize = alloc.size;
allocMemoryBackingPtr = alloc.backingMemory;
}
@@ -5136,8 +5136,8 @@ bool ThreadState::ExecuteInstruction(DebugAPIWrapper *apiWrapper,
RDCASSERTNOTEQUAL(baseMemoryId, DXILDebug::INVALID_ID);
RDCASSERTNOTEQUAL(resultId, DXILDebug::INVALID_ID);
RDCASSERT(IsVariableAssigned(baseMemoryId));
const ShaderVariable a = m_Variables[baseMemoryId];
RDCASSERT(IsVariableAssigned(ptrId));
const ShaderVariable a = m_Variables[ptrId];
size_t newValueArgIdx = (opCode == Operation::CompareExchange) ? 2 : 1;
ShaderVariable b;
@@ -5252,21 +5252,33 @@ bool ThreadState::ExecuteInstruction(DebugAPIWrapper *apiWrapper,
UpdateBackingMemoryFromVariable(baseMemoryBackingPtr, allocSize, res);
ShaderVariableChange change;
change.before = a;
if(m_State)
change.before = a;
UpdateMemoryVariableFromBackingMemory(baseMemoryId, allocMemoryBackingPtr);
// record the change to the base memory variable
change.after = m_Variables[baseMemoryId];
if(m_State)
{
change.after = m_Variables[baseMemoryId];
m_State->changes.push_back(change);
}
// record the change to the ptr variable value
RDCASSERT(IsVariableAssigned(ptrId));
if(m_State)
change.before = m_Variables[ptrId];
// Update the ptr variable value
m_Variables[ptrId].value = res.value;
if(m_State)
{
change.after = m_Variables[ptrId];
m_State->changes.push_back(change);
}
// Update the ptr variable value
// Set the result to be the ptr variable which will then be recorded as a change
RDCASSERT(IsVariableAssigned(ptrId));
result = m_Variables[ptrId];
result.value = res.value;
resultId = ptrId;
break;
}
case Operation::AddrSpaceCast:
@@ -5626,6 +5638,7 @@ void ThreadState::UpdateMemoryVariableFromBackingMemory(Id memoryId, const void
{
for(uint32_t i = 0; i < baseMemory.members.size(); ++i)
{
RDCASSERT(elementSize < sizeof(ShaderValue), elementSize);
memcpy(&baseMemory.members[i].value.f32v[0], src, elementSize);
src += elementSize;
}