Renamed D3D12CommandData::AddCPUUsage -> AddEventResourceUsage

- Inlined D3D12CommandData::AddEventResourceUsage
This commit is contained in:
Jake Turner committed 2026-11-12 09:19:14 +00:00
1 parent c2472f3360
commit fc21fa593f
5 files changed
+10 -20

No files matched your search

@@ -63,8 +63,6 @@ bool WrappedID3D12GraphicsCommandList::Serialise_Barrier(SerialiserType &ser, UI
D3D12_TEXTURE_BARRIER *tex = filteredUnwrappedTex.data();
D3D12_BUFFER_BARRIER *buf = filteredUnwrappedBuf.data();
D3D12EventNode &eventNode = m_Cmd->m_LoadingEventNode;
// filter out any barriers that reference a NULL resource - this means the resource wasn't used
// elsewhere so was discarded from the capture
for(UINT i = 0; i < NumBarrierGroups; i++)
@@ -87,7 +85,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_Barrier(SerialiserType &ser, UI
group.NumBarriers++;
if(IsLoading(m_State))
eventNode.resourceUsage.push_back(make_rdcpair(GetResID(res), ResourceUsage::Barrier));
m_Cmd->AddEventResourceUsage(GetResID(res), ResourceUsage::Barrier);
}
}
@@ -113,7 +111,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_Barrier(SerialiserType &ser, UI
group.NumBarriers++;
if(IsLoading(m_State))
eventNode.resourceUsage.push_back(make_rdcpair(GetResID(res), ResourceUsage::Barrier));
m_Cmd->AddEventResourceUsage(GetResID(res), ResourceUsage::Barrier);
}
}
@@ -510,16 +510,10 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ResourceBarrier(
if(IsLoading(m_State) && (res1 || res2))
{
D3D12EventNode &eventNode = m_Cmd->m_LoadingEventNode;
if(res1)
{
eventNode.resourceUsage.push_back(make_rdcpair(GetResID(res1), ResourceUsage::Barrier));
}
m_Cmd->AddEventResourceUsage(GetResID(res1), ResourceUsage::Barrier);
if(res2)
{
eventNode.resourceUsage.push_back(make_rdcpair(GetResID(res2), ResourceUsage::Barrier));
}
m_Cmd->AddEventResourceUsage(GetResID(res2), ResourceUsage::Barrier);
}
}
}
@@ -2001,11 +2001,6 @@ void D3D12CommandData::AddEvent()
m_AddedEventNode = true;
}
void D3D12CommandData::AddCPUUsage(ResourceId id, ResourceUsage usage)
{
m_LoadingEventNode.resourceUsage.push_back(make_rdcpair<ResourceId, ResourceUsage>(id, usage));
}
void D3D12CommandData::AddUsageForBindInRootSig(const D3D12RenderState &state,
D3D12EventNode &eventNode,
const D3D12RenderState::RootSignature *rootsig,
+4 -1
View File
@@ -412,5 +412,8 @@ struct D3D12CommandData
eventNode.AddResourceUsage(id, usage);
}
void AddCPUUsage(ResourceId id, ResourceUsage usage);
void AddEventResourceUsage(ResourceId id, ResourceUsage usage)
{
m_LoadingEventNode.AddResourceUsage(id, usage);
}
};
+2 -2
View File
@@ -2268,7 +2268,7 @@ bool WrappedID3D12Device::Serialise_MapDataWrite(SerialiserType &ser, ID3D12Reso
if(IsLoading(m_State))
{
cmd.AddCPUUsage(GetResID(Resource), ResourceUsage::CPUWrite);
cmd.AddEventResourceUsage(GetResID(Resource), ResourceUsage::CPUWrite);
// when CPU uploading we just save the range (wouldn't be necessary if the range was
// serialised before the blob)
@@ -2443,7 +2443,7 @@ bool WrappedID3D12Device::Serialise_WriteToSubresource(SerialiserType &ser, ID3D
D3D12CommandData &cmd = *m_Queue->GetCommandData();
if(IsLoading(m_State))
cmd.AddCPUUsage(GetResID(Resource), ResourceUsage::CPUWrite);
cmd.AddEventResourceUsage(GetResID(Resource), ResourceUsage::CPUWrite);
ResourceId id = GetResID(Resource);
if(m_UploadResourceIds.find(id) != m_UploadResourceIds.end())