diff --git a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp index 59c33f7e0..d026d401d 100644 --- a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp +++ b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp @@ -1500,11 +1500,24 @@ void WrappedID3D12GraphicsCommandList::OMSetRenderTargets( RTsSingleHandleToDescriptorRange, pDepthStencilDescriptor); m_ListRecord->AddChunk(scope.Get()); - for(UINT i = 0; i < numHandles; i++) + if(RTsSingleHandleToDescriptorRange) { - D3D12Descriptor *desc = GetWrapped(pRenderTargetDescriptors[i]); - m_ListRecord->MarkResourceFrameReferenced(desc->GetHeapResourceId(), eFrameRef_Read); - m_ListRecord->MarkResourceFrameReferenced(desc->GetResResourceId(), eFrameRef_PartialWrite); + D3D12Descriptor *desc = GetWrapped(pRenderTargetDescriptors[0]); + for(UINT i = 0; i < NumRenderTargetDescriptors; i++) + { + m_ListRecord->MarkResourceFrameReferenced(desc->GetHeapResourceId(), eFrameRef_Read); + m_ListRecord->MarkResourceFrameReferenced(desc->GetResResourceId(), eFrameRef_PartialWrite); + desc++; + } + } + else + { + for(UINT i = 0; i < NumRenderTargetDescriptors; i++) + { + D3D12Descriptor *desc = GetWrapped(pRenderTargetDescriptors[i]); + m_ListRecord->MarkResourceFrameReferenced(desc->GetHeapResourceId(), eFrameRef_Read); + m_ListRecord->MarkResourceFrameReferenced(desc->GetResResourceId(), eFrameRef_PartialWrite); + } } if(pDepthStencilDescriptor) diff --git a/util/test/demos/d3d12/d3d12_rendertarget_binds.cpp b/util/test/demos/d3d12/d3d12_rendertarget_binds.cpp new file mode 100644 index 000000000..7e68faedb --- /dev/null +++ b/util/test/demos/d3d12/d3d12_rendertarget_binds.cpp @@ -0,0 +1,213 @@ +/****************************************************************************** + * The MIT License (MIT) + * + * Copyright (c) 2019-2020 Baldur Karlsson + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + ******************************************************************************/ + +#include "d3d12_test.h" + +RD_TEST(D3D12_RenderTarget_Binds, D3D12GraphicsTest) +{ + static constexpr const char *Description = + "Tests the different combinations of how OMSetRenderTargets can be used."; + + std::string pixel = R"EOSHADER( + +cbuffer rootconsts : register(b0) +{ + float4 col1; + float4 col2; +}; + +void main(out float4 out1 : SV_Target0, out float4 out2 : SV_Target1) +{ + out1 = col1; + out2 = col2; +} + +)EOSHADER"; + + int main() + { + // initialise, create window, create device, etc + if(!Init()) + return 3; + + ID3DBlobPtr vsblob = Compile(D3DDefaultVertex, "main", "vs_4_0"); + ID3DBlobPtr psblob = Compile(pixel, "main", "ps_4_0"); + + ID3D12ResourcePtr vb = MakeBuffer().Data(DefaultTri); + + ID3D12RootSignaturePtr sig = MakeSig({ + constParam(D3D12_SHADER_VISIBILITY_PIXEL, 0, 0, 8), + }); + + ID3D12PipelineStatePtr pso = MakePSO().RootSig(sig).InputLayout().VS(vsblob).PS(psblob).RTVs( + {backbufferFmt, backbufferFmt}); + + ResourceBarrier(vb, D3D12_RESOURCE_STATE_COMMON, D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER); + + // 0-3 dynamic in frame, 4-7 'static', 8 is the one we shouldn't write to + ID3D12ResourcePtr rtvtex[9]; + wchar_t name[] = L"TextureA"; + + size_t badrt = ARRAY_COUNT(rtvtex) - 1; + + for(int i = 0; i < ARRAY_COUNT(rtvtex); i++) + rtvtex[i] = MakeTexture(backbufferFmt, screenWidth, screenHeight) + .RTV() + .InitialState(D3D12_RESOURCE_STATE_RENDER_TARGET); + + { + ID3D12GraphicsCommandListPtr cmd = GetCommandBuffer(); + + Reset(cmd); + + // clear the ones we want to use to green, and the one we don't want to use to black. + // only do this once so we don't add unintended references to the textures in-frame + for(int i = 0; i < ARRAY_COUNT(rtvtex) - 1; i++) + { + ClearRenderTargetView(cmd, MakeRTV(rtvtex[i]).CreateCPU(1), {0.0f, 1.0f, 0.0f, 1.0f}); + rtvtex[i]->SetName(name); + name[7]++; + } + + ClearRenderTargetView(cmd, MakeRTV(rtvtex[badrt]).CreateCPU(1), {0.0f, 0.0f, 0.0f, 1.0f}); + rtvtex[badrt]->SetName(L"NoWriteTexture"); + + cmd->Close(); + + Submit({cmd}); + } + + // pre-configure some tests to ensure we pull in these textures correctly + + D3D12_CPU_DESCRIPTOR_HANDLE directarray_static[2]; + directarray_static[0] = MakeRTV(rtvtex[4]).CreateCPU(10); + MakeRTV(rtvtex[badrt]).CreateCPU(11); + directarray_static[1] = MakeRTV(rtvtex[5]).CreateCPU(12); + MakeRTV(rtvtex[badrt]).CreateCPU(13); + + D3D12_CPU_DESCRIPTOR_HANDLE indirectarray_static[2]; + indirectarray_static[0] = MakeRTV(rtvtex[6]).CreateCPU(14); + MakeRTV(rtvtex[7]).CreateCPU(15); + MakeRTV(rtvtex[badrt]).CreateCPU(16); + indirectarray_static[1] = MakeRTV(rtvtex[badrt]).CreateCPU(17); + + bbTex[0]->SetName(L"Swapchain 0"); + bbTex[1]->SetName(L"Swapchain 1"); + + Vec4f col; + + while(Running()) + { + ID3D12GraphicsCommandListPtr cmd = GetCommandBuffer(); + + Reset(cmd); + + ID3D12ResourcePtr bb = StartUsingBackbuffer(cmd, D3D12_RESOURCE_STATE_RENDER_TARGET); + + D3D12_CPU_DESCRIPTOR_HANDLE bbrtv = + MakeRTV(bb).Format(DXGI_FORMAT_R8G8B8A8_UNORM_SRGB).CreateCPU(30); + + ClearRenderTargetView(cmd, bbrtv, {1.0f, 0.0f, 1.0f, 1.0f}); + + cmd->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + + IASetVertexBuffer(cmd, vb, sizeof(DefaultA2V), 0); + cmd->SetPipelineState(pso); + cmd->SetGraphicsRootSignature(sig); + + RSSetViewport(cmd, {0.0f, 0.0f, (float)screenWidth, (float)screenHeight, 0.0f, 1.0f}); + RSSetScissorRect(cmd, {0, 0, screenWidth, screenHeight}); + + D3D12_CPU_DESCRIPTOR_HANDLE directarray_dynamic[2]; + + // pass array of handles, and put the RTV we shouldn't render to after each one to ensure we + // don't mis-interpret + directarray_dynamic[0] = MakeRTV(rtvtex[0]).CreateCPU(0); + MakeRTV(rtvtex[badrt]).CreateCPU(1); + directarray_dynamic[1] = MakeRTV(rtvtex[1]).CreateCPU(2); + MakeRTV(rtvtex[badrt]).CreateCPU(3); + + cmd->OMSetRenderTargets(2, directarray_dynamic, FALSE, NULL); + + // immediately trash the used descriptors - they should be consumed in the above call + MakeRTV(rtvtex[badrt]).CreateCPU(0); + MakeRTV(rtvtex[badrt]).CreateCPU(2); + + // do draw + col = Vec4f(1.0f, 0.0f, 0.0f, 1.0f); + cmd->SetGraphicsRoot32BitConstants(0, 4, &col, 0); + col = Vec4f(0.0f, 0.0f, 1.0f, 1.0f); + cmd->SetGraphicsRoot32BitConstants(0, 4, &col, 4); + cmd->DrawInstanced(3, 1, 0, 0); + + D3D12_CPU_DESCRIPTOR_HANDLE indirectarray_dynamic[2]; + indirectarray_dynamic[0] = MakeRTV(rtvtex[2]).CreateCPU(4); + MakeRTV(rtvtex[3]).CreateCPU(5); + MakeRTV(rtvtex[badrt]).CreateCPU(6); + indirectarray_dynamic[1] = MakeRTV(rtvtex[badrt]).CreateCPU(7); + + cmd->OMSetRenderTargets(2, indirectarray_dynamic, TRUE, NULL); + + MakeRTV(rtvtex[badrt]).CreateCPU(0); + MakeRTV(rtvtex[badrt]).CreateCPU(2); + + col = Vec4f(1.0f, 1.0f, 0.0f, 1.0f); + cmd->SetGraphicsRoot32BitConstants(0, 4, &col, 0); + col = Vec4f(0.0f, 1.0f, 1.0f, 1.0f); + cmd->SetGraphicsRoot32BitConstants(0, 4, &col, 4); + cmd->DrawInstanced(3, 1, 0, 0); + + // now repeat with the static tests, without any trashing, to ensure they are referenced + // properly. + + cmd->OMSetRenderTargets(2, directarray_static, FALSE, NULL); + + col = Vec4f(1.0f, 0.0f, 0.0f, 1.0f); + cmd->SetGraphicsRoot32BitConstants(0, 4, &col, 0); + col = Vec4f(0.0f, 0.0f, 1.0f, 1.0f); + cmd->SetGraphicsRoot32BitConstants(0, 4, &col, 4); + cmd->DrawInstanced(3, 1, 0, 0); + + cmd->OMSetRenderTargets(2, indirectarray_static, TRUE, NULL); + + col = Vec4f(1.0f, 1.0f, 0.0f, 1.0f); + cmd->SetGraphicsRoot32BitConstants(0, 4, &col, 0); + col = Vec4f(0.0f, 1.0f, 1.0f, 1.0f); + cmd->SetGraphicsRoot32BitConstants(0, 4, &col, 4); + cmd->DrawInstanced(3, 1, 0, 0); + + FinishUsingBackbuffer(cmd, D3D12_RESOURCE_STATE_RENDER_TARGET); + + cmd->Close(); + + Submit({cmd}); + + Present(); + } + + return 0; + } +}; + +REGISTER_TEST(); diff --git a/util/test/demos/d3d12/d3d12_test.cpp b/util/test/demos/d3d12/d3d12_test.cpp index e9e4d175e..4f18cd735 100644 --- a/util/test/demos/d3d12/d3d12_test.cpp +++ b/util/test/demos/d3d12/d3d12_test.cpp @@ -309,7 +309,7 @@ bool D3D12GraphicsTest::Init() D3D12_DESCRIPTOR_HEAP_DESC desc; desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; desc.NodeMask = 1; - desc.NumDescriptors = 8; + desc.NumDescriptors = 32; desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV; CHECK_HR(dev->CreateDescriptorHeap(&desc, __uuidof(ID3D12DescriptorHeap), (void **)&m_RTV)); diff --git a/util/test/demos/demos.vcxproj b/util/test/demos/demos.vcxproj index 828ade96b..1f2e3e56d 100644 --- a/util/test/demos/demos.vcxproj +++ b/util/test/demos/demos.vcxproj @@ -170,6 +170,7 @@ + diff --git a/util/test/demos/demos.vcxproj.filters b/util/test/demos/demos.vcxproj.filters index e76366bc1..9104c9505 100644 --- a/util/test/demos/demos.vcxproj.filters +++ b/util/test/demos/demos.vcxproj.filters @@ -451,6 +451,9 @@ D3D12\demos + + D3D12\demos + diff --git a/util/test/tests/D3D12/D3D12_RenderTarget_Binds.py b/util/test/tests/D3D12/D3D12_RenderTarget_Binds.py new file mode 100644 index 000000000..939aa200d --- /dev/null +++ b/util/test/tests/D3D12/D3D12_RenderTarget_Binds.py @@ -0,0 +1,84 @@ +import renderdoc as rd +import rdtest + + +class D3D12_RenderTarget_Binds(rdtest.TestCase): + demos_test_name = 'D3D12_RenderTarget_Binds' + + def check_capture(self): + # find the clear + draw = self.find_draw("ClearRenderTargetView") + + self.controller.SetFrameEvent(draw.eventId, False) + + pipe: rd.PipeState = self.controller.GetPipelineState() + + self.check_pixel_value(draw.copyDestination, 0.5, 0.5, [1.0, 0.0, 1.0, 1.0]) + + self.check('Swapchain' in self.get_resource(draw.copyDestination).name) + + rdtest.log.success("Picked value for clear is as expected") + + draw = draw.next + + self.controller.SetFrameEvent(draw.eventId, False) + + pipe: rd.PipeState = self.controller.GetPipelineState() + + rtvs = pipe.GetOutputTargets() + self.check(len(rtvs) == 2) + + self.check_triangle(out=rtvs[0].resourceId, back=[0.0, 1.0, 0.0, 1.0], fore=[1.0, 0.0, 0.0, 1.0]) + self.check_triangle(out=rtvs[1].resourceId, back=[0.0, 1.0, 0.0, 1.0], fore=[0.0, 0.0, 1.0, 1.0]) + self.check(self.get_resource(rtvs[0].resourceId).name == 'TextureA') + self.check(self.get_resource(rtvs[1].resourceId).name == 'TextureB') + + rdtest.log.success("RTVs at first draw are as expected") + + draw = draw.next + + self.controller.SetFrameEvent(draw.eventId, False) + + pipe: rd.PipeState = self.controller.GetPipelineState() + + rtvs = pipe.GetOutputTargets() + self.check(len(rtvs) == 2) + + self.check_triangle(out=rtvs[0].resourceId, back=[0.0, 1.0, 0.0, 1.0], fore=[1.0, 1.0, 0.0, 1.0]) + self.check_triangle(out=rtvs[1].resourceId, back=[0.0, 1.0, 0.0, 1.0], fore=[0.0, 1.0, 1.0, 1.0]) + self.check(self.get_resource(rtvs[0].resourceId).name == 'TextureC') + self.check(self.get_resource(rtvs[1].resourceId).name == 'TextureD') + + rdtest.log.success("RTVs at second draw are as expected") + + draw = draw.next + + self.controller.SetFrameEvent(draw.eventId, False) + + pipe: rd.PipeState = self.controller.GetPipelineState() + + rtvs = pipe.GetOutputTargets() + self.check(len(rtvs) == 2) + + self.check_triangle(out=rtvs[0].resourceId, back=[0.0, 1.0, 0.0, 1.0], fore=[1.0, 0.0, 0.0, 1.0]) + self.check_triangle(out=rtvs[1].resourceId, back=[0.0, 1.0, 0.0, 1.0], fore=[0.0, 0.0, 1.0, 1.0]) + self.check(self.get_resource(rtvs[0].resourceId).name == 'TextureE') + self.check(self.get_resource(rtvs[1].resourceId).name == 'TextureF') + + rdtest.log.success("RTVs at third draw are as expected") + + draw = draw.next + + self.controller.SetFrameEvent(draw.eventId, False) + + pipe: rd.PipeState = self.controller.GetPipelineState() + + rtvs = pipe.GetOutputTargets() + self.check(len(rtvs) == 2) + + self.check_triangle(out=rtvs[0].resourceId, back=[0.0, 1.0, 0.0, 1.0], fore=[1.0, 1.0, 0.0, 1.0]) + self.check_triangle(out=rtvs[1].resourceId, back=[0.0, 1.0, 0.0, 1.0], fore=[0.0, 1.0, 1.0, 1.0]) + self.check(self.get_resource(rtvs[0].resourceId).name == 'TextureG') + self.check(self.get_resource(rtvs[1].resourceId).name == 'TextureH') + + rdtest.log.success("RTVs at fourth draw are as expected")