diff --git a/renderdoc/driver/d3d12/d3d12_command_list1_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list1_wrap.cpp index 722a3296c..dd45afeea 100644 --- a/renderdoc/driver/d3d12/d3d12_command_list1_wrap.cpp +++ b/renderdoc/driver/d3d12/d3d12_command_list1_wrap.cpp @@ -95,14 +95,12 @@ bool WrappedID3D12GraphicsCommandList::Serialise_AtomicCopyBufferUINT( if(pSrcBuffer == pDstBuffer) { - eventNode.resourceUsage.push_back(make_rdcpair(GetResID(pSrcBuffer), ResourceUsage::Copy)); + eventNode.AddResourceUsage(GetResID(pSrcBuffer), ResourceUsage::Copy); } else { - eventNode.resourceUsage.push_back( - make_rdcpair(GetResID(pSrcBuffer), ResourceUsage::CopySrc)); - eventNode.resourceUsage.push_back( - make_rdcpair(GetResID(pDstBuffer), ResourceUsage::CopyDst)); + eventNode.AddResourceUsage(GetResID(pSrcBuffer), ResourceUsage::CopySrc); + eventNode.AddResourceUsage(GetResID(pDstBuffer), ResourceUsage::CopyDst); } } } @@ -207,14 +205,12 @@ bool WrappedID3D12GraphicsCommandList::Serialise_AtomicCopyBufferUINT64( if(pSrcBuffer == pDstBuffer) { - eventNode.resourceUsage.push_back(make_rdcpair(GetResID(pSrcBuffer), ResourceUsage::Copy)); + eventNode.AddResourceUsage(GetResID(pSrcBuffer), ResourceUsage::Copy); } else { - eventNode.resourceUsage.push_back( - make_rdcpair(GetResID(pSrcBuffer), ResourceUsage::CopySrc)); - eventNode.resourceUsage.push_back( - make_rdcpair(GetResID(pDstBuffer), ResourceUsage::CopyDst)); + eventNode.AddResourceUsage(GetResID(pSrcBuffer), ResourceUsage::CopySrc); + eventNode.AddResourceUsage(GetResID(pDstBuffer), ResourceUsage::CopyDst); } } } @@ -489,15 +485,12 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ResolveSubresourceRegion( if(pSrcResource == pDstResource) { - eventNode.resourceUsage.push_back( - make_rdcpair(GetResID(pSrcResource), ResourceUsage::Resolve)); + eventNode.AddResourceUsage(GetResID(pSrcResource), ResourceUsage::Resolve); } else { - eventNode.resourceUsage.push_back( - make_rdcpair(GetResID(pSrcResource), ResourceUsage::ResolveSrc)); - eventNode.resourceUsage.push_back( - make_rdcpair(GetResID(pDstResource), ResourceUsage::ResolveDst)); + eventNode.AddResourceUsage(GetResID(pSrcResource), ResourceUsage::ResolveSrc); + eventNode.AddResourceUsage(GetResID(pDstResource), ResourceUsage::ResolveDst); } } } diff --git a/renderdoc/driver/d3d12/d3d12_command_list4_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list4_wrap.cpp index 4ab2b1af0..f22fcd9a8 100644 --- a/renderdoc/driver/d3d12/d3d12_command_list4_wrap.cpp +++ b/renderdoc/driver/d3d12/d3d12_command_list4_wrap.cpp @@ -1399,13 +1399,13 @@ bool WrappedID3D12GraphicsCommandList::Serialise_EmitRaytracingAccelerationStruc D3D12EventNode &eventNode = m_Cmd->GetLastEventNode(); - eventNode.resourceUsage.push_back(make_rdcpair( - WrappedID3D12Resource::GetResIDFromAddr(Desc.DestBuffer), ResourceUsage::CopyDst)); + eventNode.AddResourceUsage(WrappedID3D12Resource::GetResIDFromAddr(Desc.DestBuffer), + ResourceUsage::CopyDst); for(UINT i = 0; i < NumSourceAccelerationStructures; i++) { - eventNode.resourceUsage.push_back(make_rdcpair( + eventNode.AddResourceUsage( WrappedID3D12Resource::GetResIDFromAddr(pSourceAccelerationStructureData[i]), - ResourceUsage::CopySrc)); + ResourceUsage::CopySrc); } } } diff --git a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp index 45698fa35..8abd7a9b6 100644 --- a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp +++ b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp @@ -3017,8 +3017,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ResolveQueryData( m_Cmd->AddAction(action); D3D12EventNode &eventNode = m_Cmd->GetLastEventNode(); - eventNode.resourceUsage.push_back( - make_rdcpair(GetResID(pDestinationBuffer), ResourceUsage::ResolveDst)); + eventNode.AddResourceUsage(GetResID(pDestinationBuffer), ResourceUsage::ResolveDst); } } } @@ -4568,12 +4567,10 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ExecuteIndirect( eventNode.hasExecuteData = true; cmdInfo.hasExecuteDatas = true; - eventNode.resourceUsage.push_back( - make_rdcpair(GetResID(pArgumentBuffer), ResourceUsage::Indirect)); + eventNode.AddResourceUsage(GetResID(pArgumentBuffer), ResourceUsage::Indirect); if(pCountBuffer) { - eventNode.resourceUsage.push_back( - make_rdcpair(GetResID(pCountBuffer), ResourceUsage::Indirect)); + eventNode.AddResourceUsage(GetResID(pCountBuffer), ResourceUsage::Indirect); } } @@ -4773,8 +4770,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ClearDepthStencilView( m_Cmd->AddAction(action); D3D12EventNode &eventNode = m_Cmd->GetLastEventNode(); - eventNode.resourceUsage.push_back( - make_rdcpair(descriptor->GetResResourceId(), ResourceUsage::Clear)); + eventNode.AddResourceUsage(descriptor->GetResResourceId(), ResourceUsage::Clear); } } } @@ -4872,8 +4868,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ClearRenderTargetView( m_Cmd->AddAction(action); D3D12EventNode &eventNode = m_Cmd->GetLastEventNode(); - eventNode.resourceUsage.push_back( - make_rdcpair(descriptor->GetResResourceId(), ResourceUsage::Clear)); + eventNode.AddResourceUsage(descriptor->GetResResourceId(), ResourceUsage::Clear); } } } @@ -4974,7 +4969,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ClearUnorderedAccessViewUint( m_Cmd->AddAction(action); D3D12EventNode &eventNode = m_Cmd->GetLastEventNode(); - eventNode.resourceUsage.push_back(make_rdcpair(GetResID(pResource), ResourceUsage::Clear)); + eventNode.AddResourceUsage(GetResID(pResource), ResourceUsage::Clear); } } } @@ -5083,7 +5078,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ClearUnorderedAccessViewFloat( m_Cmd->AddAction(action); D3D12EventNode &eventNode = m_Cmd->GetLastEventNode(); - eventNode.resourceUsage.push_back(make_rdcpair(GetResID(pResource), ResourceUsage::Clear)); + eventNode.AddResourceUsage(GetResID(pResource), ResourceUsage::Clear); } } } @@ -5170,7 +5165,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_DiscardResource(SerialiserType m_Cmd->AddAction(action); D3D12EventNode &eventNode = m_Cmd->GetLastEventNode(); - eventNode.resourceUsage.push_back(make_rdcpair(GetResID(pResource), ResourceUsage::Discard)); + eventNode.AddResourceUsage(GetResID(pResource), ResourceUsage::Discard); } } } @@ -5258,14 +5253,12 @@ bool WrappedID3D12GraphicsCommandList::Serialise_CopyBufferRegion(SerialiserType if(pSrcBuffer == pDstBuffer) { - eventNode.resourceUsage.push_back(make_rdcpair(GetResID(pSrcBuffer), ResourceUsage::Copy)); + eventNode.AddResourceUsage(GetResID(pSrcBuffer), ResourceUsage::Copy); } else { - eventNode.resourceUsage.push_back( - make_rdcpair(GetResID(pSrcBuffer), ResourceUsage::CopySrc)); - eventNode.resourceUsage.push_back( - make_rdcpair(GetResID(pDstBuffer), ResourceUsage::CopyDst)); + eventNode.AddResourceUsage(GetResID(pSrcBuffer), ResourceUsage::CopySrc); + eventNode.AddResourceUsage(GetResID(pDstBuffer), ResourceUsage::CopyDst); } } } @@ -5374,12 +5367,12 @@ bool WrappedID3D12GraphicsCommandList::Serialise_CopyTextureRegion( if(origSrc == origDst) { - eventNode.resourceUsage.push_back(make_rdcpair(liveSrc, ResourceUsage::Copy)); + eventNode.AddResourceUsage(liveSrc, ResourceUsage::Copy); } else { - eventNode.resourceUsage.push_back(make_rdcpair(liveSrc, ResourceUsage::CopySrc)); - eventNode.resourceUsage.push_back(make_rdcpair(liveDst, ResourceUsage::CopyDst)); + eventNode.AddResourceUsage(liveSrc, ResourceUsage::CopySrc); + eventNode.AddResourceUsage(liveDst, ResourceUsage::CopyDst); } } } @@ -5466,14 +5459,12 @@ bool WrappedID3D12GraphicsCommandList::Serialise_CopyResource(SerialiserType &se if(pSrcResource == pDstResource) { - eventNode.resourceUsage.push_back(make_rdcpair(GetResID(pSrcResource), ResourceUsage::Copy)); + eventNode.AddResourceUsage(GetResID(pSrcResource), ResourceUsage::Copy); } else { - eventNode.resourceUsage.push_back( - make_rdcpair(GetResID(pSrcResource), ResourceUsage::CopySrc)); - eventNode.resourceUsage.push_back( - make_rdcpair(GetResID(pDstResource), ResourceUsage::CopyDst)); + eventNode.AddResourceUsage(GetResID(pSrcResource), ResourceUsage::CopySrc); + eventNode.AddResourceUsage(GetResID(pDstResource), ResourceUsage::CopyDst); } } } @@ -5563,15 +5554,12 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ResolveSubresource( if(pSrcResource == pDstResource) { - eventNode.resourceUsage.push_back( - make_rdcpair(GetResID(pSrcResource), ResourceUsage::Resolve)); + eventNode.AddResourceUsage(GetResID(pSrcResource), ResourceUsage::Resolve); } else { - eventNode.resourceUsage.push_back( - make_rdcpair(GetResID(pSrcResource), ResourceUsage::ResolveSrc)); - eventNode.resourceUsage.push_back( - make_rdcpair(GetResID(pDstResource), ResourceUsage::ResolveDst)); + eventNode.AddResourceUsage(GetResID(pSrcResource), ResourceUsage::ResolveSrc); + eventNode.AddResourceUsage(GetResID(pDstResource), ResourceUsage::ResolveDst); } } } @@ -5677,8 +5665,8 @@ bool WrappedID3D12GraphicsCommandList::Serialise_CopyTiles( m_Cmd->AddAction(action); D3D12EventNode &eventNode = m_Cmd->GetLastEventNode(); - eventNode.resourceUsage.push_back(make_rdcpair(liveSrc, ResourceUsage::CopySrc)); - eventNode.resourceUsage.push_back(make_rdcpair(liveDst, ResourceUsage::CopyDst)); + eventNode.AddResourceUsage(liveSrc, ResourceUsage::CopySrc); + eventNode.AddResourceUsage(liveDst, ResourceUsage::CopyDst); } } } diff --git a/renderdoc/driver/d3d12/d3d12_commands.cpp b/renderdoc/driver/d3d12/d3d12_commands.cpp index 555a4655d..3e034ec67 100644 --- a/renderdoc/driver/d3d12/d3d12_commands.cpp +++ b/renderdoc/driver/d3d12/d3d12_commands.cpp @@ -2001,14 +2001,6 @@ void D3D12CommandData::AddEvent() m_AddedEventNode = true; } -void D3D12CommandData::AddResourceUsage(D3D12EventNode &eventNode, ResourceId id, ResourceUsage usage) -{ - if(id == ResourceId()) - return; - - eventNode.resourceUsage.push_back(make_rdcpair(id, usage)); -} - void D3D12CommandData::AddCPUUsage(ResourceId id, ResourceUsage usage) { m_LoadingEventNode.resourceUsage.push_back(make_rdcpair(id, usage)); @@ -2252,25 +2244,22 @@ void D3D12CommandData::AddUsage(const D3D12RenderState &state, D3D12EventNode &e } if(a.flags & ActionFlags::Indexed && state.ibuffer.buf != ResourceId()) - eventNode.resourceUsage.push_back(make_rdcpair(state.ibuffer.buf, ResourceUsage::IndexBuffer)); + eventNode.AddResourceUsage(state.ibuffer.buf, ResourceUsage::IndexBuffer); if(a.flags & ActionFlags::Drawcall) { for(size_t i = 0; i < state.vbuffers.size(); i++) { if(state.vbuffers[i].buf != ResourceId()) - eventNode.resourceUsage.push_back( - make_rdcpair(state.vbuffers[i].buf, ResourceUsage::VertexBuffer)); + eventNode.AddResourceUsage(state.vbuffers[i].buf, ResourceUsage::VertexBuffer); } for(size_t i = 0; i < state.streamouts.size(); i++) { if(state.streamouts[i].buf != ResourceId()) - eventNode.resourceUsage.push_back( - make_rdcpair(state.streamouts[i].buf, ResourceUsage::StreamOut)); + eventNode.AddResourceUsage(state.streamouts[i].buf, ResourceUsage::StreamOut); if(state.streamouts[i].countbuf != ResourceId()) - eventNode.resourceUsage.push_back( - make_rdcpair(state.streamouts[i].countbuf, ResourceUsage::StreamOut)); + eventNode.AddResourceUsage(state.streamouts[i].countbuf, ResourceUsage::StreamOut); } } @@ -2279,12 +2268,12 @@ void D3D12CommandData::AddUsage(const D3D12RenderState &state, D3D12EventNode &e for(size_t i = 0; i < rts.size(); i++) { if(rts[i] != ResourceId()) - eventNode.resourceUsage.push_back(make_rdcpair(rts[i], ResourceUsage::ColorTarget)); + eventNode.AddResourceUsage(rts[i], ResourceUsage::ColorTarget); } ResourceId id = state.GetDSVID(); if(id != ResourceId()) - eventNode.resourceUsage.push_back(make_rdcpair(id, ResourceUsage::DepthStencilTarget)); + eventNode.AddResourceUsage(id, ResourceUsage::DepthStencilTarget); } if(rootsig) diff --git a/renderdoc/driver/d3d12/d3d12_commands.h b/renderdoc/driver/d3d12/d3d12_commands.h index ca1d7cb90..5f7722653 100644 --- a/renderdoc/driver/d3d12/d3d12_commands.h +++ b/renderdoc/driver/d3d12/d3d12_commands.h @@ -67,6 +67,10 @@ struct D3D12EventNode hasExecuteData = a.hasExecuteData; return *this; } + void AddResourceUsage(ResourceId id, ResourceUsage usage) + { + resourceUsage.push_back(make_rdcpair(id, usage)); + } // eventId is not used APIEvent event; @@ -401,6 +405,12 @@ struct D3D12CommandData D3D12_DESCRIPTOR_RANGE_TYPE type, uint32_t space, uint32_t bind, uint32_t rangeSize); - void AddResourceUsage(D3D12EventNode &eventNode, ResourceId id, ResourceUsage usage); + void AddResourceUsage(D3D12EventNode &eventNode, ResourceId id, ResourceUsage usage) + { + if(id == ResourceId()) + return; + + eventNode.AddResourceUsage(id, usage); + } void AddCPUUsage(ResourceId id, ResourceUsage usage); };