diff --git a/renderdoc/driver/d3d12/d3d12_command_list7_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list7_wrap.cpp index 79a4baf08..c6f9b6918 100644 --- a/renderdoc/driver/d3d12/d3d12_command_list7_wrap.cpp +++ b/renderdoc/driver/d3d12/d3d12_command_list7_wrap.cpp @@ -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); } } diff --git a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp index 8abd7a9b6..941639d99 100644 --- a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp +++ b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp @@ -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); } } } diff --git a/renderdoc/driver/d3d12/d3d12_commands.cpp b/renderdoc/driver/d3d12/d3d12_commands.cpp index 3e034ec67..4b364f427 100644 --- a/renderdoc/driver/d3d12/d3d12_commands.cpp +++ b/renderdoc/driver/d3d12/d3d12_commands.cpp @@ -2001,11 +2001,6 @@ void D3D12CommandData::AddEvent() m_AddedEventNode = true; } -void D3D12CommandData::AddCPUUsage(ResourceId id, ResourceUsage usage) -{ - m_LoadingEventNode.resourceUsage.push_back(make_rdcpair(id, usage)); -} - void D3D12CommandData::AddUsageForBindInRootSig(const D3D12RenderState &state, D3D12EventNode &eventNode, const D3D12RenderState::RootSignature *rootsig, diff --git a/renderdoc/driver/d3d12/d3d12_commands.h b/renderdoc/driver/d3d12/d3d12_commands.h index 5f7722653..1f8714c54 100644 --- a/renderdoc/driver/d3d12/d3d12_commands.h +++ b/renderdoc/driver/d3d12/d3d12_commands.h @@ -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); + } }; diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp index f334d4b9a..2cd46f56b 100644 --- a/renderdoc/driver/d3d12/d3d12_device.cpp +++ b/renderdoc/driver/d3d12/d3d12_device.cpp @@ -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())