From 14b3a06361d8948de89ac8f19af3ae59a292ba1c Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 22 Jan 2020 16:57:54 +0000 Subject: [PATCH] Add test of D3D12 ExecuteIndirect --- .../demos/d3d12/d3d12_execute_indirect.cpp | 112 ++++++++++++++++++ util/test/demos/d3d12/d3d12_helpers.cpp | 50 ++++++++ util/test/demos/d3d12/d3d12_helpers.h | 12 ++ util/test/demos/d3d12/d3d12_test.cpp | 47 ++++++++ util/test/demos/d3d12/d3d12_test.h | 2 + util/test/demos/demos.vcxproj | 1 + util/test/demos/demos.vcxproj.filters | 3 + .../tests/D3D12/D3D12_Execute_Indirect.py | 26 ++++ 8 files changed, 253 insertions(+) create mode 100644 util/test/demos/d3d12/d3d12_execute_indirect.cpp create mode 100644 util/test/tests/D3D12/D3D12_Execute_Indirect.py diff --git a/util/test/demos/d3d12/d3d12_execute_indirect.cpp b/util/test/demos/d3d12/d3d12_execute_indirect.cpp new file mode 100644 index 000000000..bf0dc8dba --- /dev/null +++ b/util/test/demos/d3d12/d3d12_execute_indirect.cpp @@ -0,0 +1,112 @@ +/****************************************************************************** + * 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_Execute_Indirect, D3D12GraphicsTest) +{ + static constexpr const char *Description = + "Tests use of ExecuteIndirect() in different edge-case scenarios."; + + int main() + { + // initialise, create window, create device, etc + if(!Init()) + return 3; + + ID3DBlobPtr vsblob = Compile(D3DDefaultVertex, "main", "vs_4_0"); + ID3DBlobPtr psblob = Compile(D3DDefaultPixel, "main", "ps_4_0"); + + const DefaultA2V tri[3] = { + {Vec3f(-0.5f, -0.5f, 0.0f), Vec4f(0.0f, 1.0f, 0.0f, 1.0f), Vec2f(0.0f, 0.0f)}, + {Vec3f(0.0f, 0.5f, 0.0f), Vec4f(0.0f, 1.0f, 0.0f, 1.0f), Vec2f(0.0f, 1.0f)}, + {Vec3f(0.5f, -0.5f, 0.0f), Vec4f(0.0f, 1.0f, 0.0f, 1.0f), Vec2f(1.0f, 0.0f)}, + }; + + ID3D12ResourcePtr vb = MakeBuffer().Data(tri); + + ID3D12RootSignaturePtr sig = MakeSig({}); + + ID3D12CommandSignaturePtr cmdsig = MakeCommandSig(NULL, {vbArg(0), drawArg()}); + + struct + { + D3D12_VERTEX_BUFFER_VIEW vb; + D3D12_DRAW_ARGUMENTS draw; + } args; + + args.vb.BufferLocation = vb->GetGPUVirtualAddress(); + args.vb.SizeInBytes = sizeof(tri); + args.vb.StrideInBytes = sizeof(DefaultA2V); + args.draw.VertexCountPerInstance = 3; + args.draw.InstanceCount = 1; + args.draw.StartInstanceLocation = 0; + args.draw.StartVertexLocation = 0; + + ID3D12ResourcePtr argBuf = MakeBuffer().Upload().Size(sizeof(args)).Data(&args); + + ID3D12PipelineStatePtr pso = MakePSO().RootSig(sig).InputLayout().VS(vsblob).PS(psblob); + + ResourceBarrier(vb, D3D12_RESOURCE_STATE_COMMON, D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER); + + while(Running()) + { + ID3D12GraphicsCommandListPtr cmd = GetCommandBuffer(); + + Reset(cmd); + + ID3D12ResourcePtr bb = StartUsingBackbuffer(cmd, D3D12_RESOURCE_STATE_RENDER_TARGET); + + D3D12_CPU_DESCRIPTOR_HANDLE rtv = + MakeRTV(bb).Format(DXGI_FORMAT_R8G8B8A8_UNORM_SRGB).CreateCPU(0); + + ClearRenderTargetView(cmd, rtv, {1.0f, 0.0f, 0.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}); + + OMSetRenderTargets(cmd, {rtv}, {}); + + cmd->ExecuteIndirect(cmdsig, 1, argBuf, 0, NULL, 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_helpers.cpp b/util/test/demos/d3d12/d3d12_helpers.cpp index 3daa52ed0..c2efb387d 100644 --- a/util/test/demos/d3d12/d3d12_helpers.cpp +++ b/util/test/demos/d3d12/d3d12_helpers.cpp @@ -979,3 +979,53 @@ D3D12PSOCreator::operator ID3D12PipelineStatePtr() const } return pso; } + +D3D12_INDIRECT_ARGUMENT_DESC vbArg(UINT slot) +{ + return {D3D12_INDIRECT_ARGUMENT_TYPE_VERTEX_BUFFER_VIEW, slot}; +} + +D3D12_INDIRECT_ARGUMENT_DESC ibArg() +{ + return {D3D12_INDIRECT_ARGUMENT_TYPE_INDEX_BUFFER_VIEW}; +} + +D3D12_INDIRECT_ARGUMENT_DESC uavArg(UINT root) +{ + return {D3D12_INDIRECT_ARGUMENT_TYPE_UNORDERED_ACCESS_VIEW, root}; +} + +D3D12_INDIRECT_ARGUMENT_DESC srvArg(UINT root) +{ + return {D3D12_INDIRECT_ARGUMENT_TYPE_SHADER_RESOURCE_VIEW, root}; +} + +D3D12_INDIRECT_ARGUMENT_DESC cbvArg(UINT root) +{ + return {D3D12_INDIRECT_ARGUMENT_TYPE_CONSTANT_BUFFER_VIEW, root}; +} + +D3D12_INDIRECT_ARGUMENT_DESC constArg(UINT root, UINT wordOffset, UINT wordCount) +{ + D3D12_INDIRECT_ARGUMENT_DESC ret; + ret.Type = D3D12_INDIRECT_ARGUMENT_TYPE_CONSTANT; + ret.Constant.RootParameterIndex = root; + ret.Constant.DestOffsetIn32BitValues = wordOffset; + ret.Constant.Num32BitValuesToSet = wordCount; + return ret; +} + +D3D12_INDIRECT_ARGUMENT_DESC drawArg() +{ + return {D3D12_INDIRECT_ARGUMENT_TYPE_DRAW}; +} + +D3D12_INDIRECT_ARGUMENT_DESC drawIndexedArg() +{ + return {D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED}; +} + +D3D12_INDIRECT_ARGUMENT_DESC dispatchArg() +{ + return {D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH}; +} diff --git a/util/test/demos/d3d12/d3d12_helpers.h b/util/test/demos/d3d12/d3d12_helpers.h index f39cc2ca6..52936539f 100644 --- a/util/test/demos/d3d12/d3d12_helpers.h +++ b/util/test/demos/d3d12/d3d12_helpers.h @@ -46,6 +46,8 @@ COM_SMARTPTR(ID3D12CommandAllocator); COM_SMARTPTR(ID3D12CommandList); COM_SMARTPTR(ID3D12GraphicsCommandList); +COM_SMARTPTR(ID3D12CommandSignature); + COM_SMARTPTR(ID3D12RootSignature); COM_SMARTPTR(ID3D12PipelineState); @@ -238,6 +240,16 @@ D3D12_ROOT_PARAMETER1 constParam(D3D12_SHADER_VISIBILITY vis, UINT space, UINT r D3D12_ROOT_PARAMETER1 tableParam(D3D12_SHADER_VISIBILITY vis, D3D12_DESCRIPTOR_RANGE_TYPE type, UINT space, UINT basereg, UINT numreg, UINT descOffset = 0); +D3D12_INDIRECT_ARGUMENT_DESC vbArg(UINT slot); +D3D12_INDIRECT_ARGUMENT_DESC ibArg(); +D3D12_INDIRECT_ARGUMENT_DESC uavArg(UINT root); +D3D12_INDIRECT_ARGUMENT_DESC srvArg(UINT root); +D3D12_INDIRECT_ARGUMENT_DESC cbvArg(UINT root); +D3D12_INDIRECT_ARGUMENT_DESC constArg(UINT root, UINT wordOffset, UINT wordCount); +D3D12_INDIRECT_ARGUMENT_DESC drawArg(); +D3D12_INDIRECT_ARGUMENT_DESC drawIndexedArg(); +D3D12_INDIRECT_ARGUMENT_DESC dispatchArg(); + #define GET_REFCOUNT(val, obj) \ do \ { \ diff --git a/util/test/demos/d3d12/d3d12_test.cpp b/util/test/demos/d3d12/d3d12_test.cpp index fad8c605a..c3dc8542b 100644 --- a/util/test/demos/d3d12/d3d12_test.cpp +++ b/util/test/demos/d3d12/d3d12_test.cpp @@ -1117,3 +1117,50 @@ ID3D12RootSignaturePtr D3D12GraphicsTest::MakeSig(const std::vector ¶ms) +{ + D3D12_COMMAND_SIGNATURE_DESC desc = {}; + desc.pArgumentDescs = params.data(); + desc.NumArgumentDescs = (UINT)params.size(); + + for(const D3D12_INDIRECT_ARGUMENT_DESC &p : params) + { + switch(p.Type) + { + case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW: + desc.ByteStride += sizeof(D3D12_DRAW_ARGUMENTS); + break; + case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED: + desc.ByteStride += sizeof(D3D12_DRAW_INDEXED_ARGUMENTS); + break; + case D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH: + desc.ByteStride += sizeof(D3D12_DISPATCH_ARGUMENTS); + break; + case D3D12_INDIRECT_ARGUMENT_TYPE_VERTEX_BUFFER_VIEW: + desc.ByteStride += sizeof(D3D12_VERTEX_BUFFER_VIEW); + break; + case D3D12_INDIRECT_ARGUMENT_TYPE_INDEX_BUFFER_VIEW: + desc.ByteStride += sizeof(D3D12_INDEX_BUFFER_VIEW); + break; + case D3D12_INDIRECT_ARGUMENT_TYPE_CONSTANT: + desc.ByteStride += p.Constant.Num32BitValuesToSet * sizeof(uint32_t); + break; + case D3D12_INDIRECT_ARGUMENT_TYPE_CONSTANT_BUFFER_VIEW: + desc.ByteStride += sizeof(D3D12_GPU_VIRTUAL_ADDRESS); + break; + case D3D12_INDIRECT_ARGUMENT_TYPE_SHADER_RESOURCE_VIEW: + desc.ByteStride += sizeof(D3D12_GPU_VIRTUAL_ADDRESS); + break; + case D3D12_INDIRECT_ARGUMENT_TYPE_UNORDERED_ACCESS_VIEW: + desc.ByteStride += sizeof(D3D12_GPU_VIRTUAL_ADDRESS); + break; + } + } + + ID3D12CommandSignaturePtr ret; + CHECK_HR( + dev->CreateCommandSignature(&desc, rootSig, __uuidof(ID3D12CommandSignature), (void **)&ret)); + return ret; +} diff --git a/util/test/demos/d3d12/d3d12_test.h b/util/test/demos/d3d12/d3d12_test.h index 5f41baa70..1853dcb39 100644 --- a/util/test/demos/d3d12/d3d12_test.h +++ b/util/test/demos/d3d12/d3d12_test.h @@ -86,6 +86,8 @@ struct D3D12GraphicsTest : public GraphicsTest const std::vector ¶ms, D3D12_ROOT_SIGNATURE_FLAGS Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT, UINT NumStaticSamplers = 0, const D3D12_STATIC_SAMPLER_DESC *StaticSamplers = NULL); + ID3D12CommandSignaturePtr MakeCommandSig(ID3D12RootSignaturePtr rootSig, + const std::vector ¶ms); D3D12PSOCreator MakePSO() { return D3D12PSOCreator(this); } D3D12BufferCreator MakeBuffer() { return D3D12BufferCreator(this); } D3D12TextureCreator MakeTexture(DXGI_FORMAT format, UINT width) diff --git a/util/test/demos/demos.vcxproj b/util/test/demos/demos.vcxproj index aa200243d..32d77fb97 100644 --- a/util/test/demos/demos.vcxproj +++ b/util/test/demos/demos.vcxproj @@ -160,6 +160,7 @@ + diff --git a/util/test/demos/demos.vcxproj.filters b/util/test/demos/demos.vcxproj.filters index 9e90b587f..62ba55050 100644 --- a/util/test/demos/demos.vcxproj.filters +++ b/util/test/demos/demos.vcxproj.filters @@ -397,6 +397,9 @@ D3D12\demos + + D3D12\demos + diff --git a/util/test/tests/D3D12/D3D12_Execute_Indirect.py b/util/test/tests/D3D12/D3D12_Execute_Indirect.py new file mode 100644 index 000000000..3d9f606ca --- /dev/null +++ b/util/test/tests/D3D12/D3D12_Execute_Indirect.py @@ -0,0 +1,26 @@ +import renderdoc as rd +import rdtest + + +class D3D12_Execute_Indirect(rdtest.TestCase): + demos_test_name = 'D3D12_Execute_Indirect' + + def check_capture(self): + draw = self.find_draw("IndirectDraw") + + self.controller.SetFrameEvent(draw.eventId, False) + + pipe: rd.PipeState = self.controller.GetPipelineState() + + # Should be a green triangle in the centre of the screen + self.check_pixel_value(pipe.GetOutputTargets()[0].resourceId, 0.5, 0.5, [0.0, 1.0, 0.0, 1.0]) + self.check_pixel_value(pipe.GetOutputTargets()[0].resourceId, 0.5, 0.3, [0.0, 1.0, 0.0, 1.0]) + self.check_pixel_value(pipe.GetOutputTargets()[0].resourceId, 0.3, 0.7, [0.0, 1.0, 0.0, 1.0]) + self.check_pixel_value(pipe.GetOutputTargets()[0].resourceId, 0.7, 0.7, [0.0, 1.0, 0.0, 1.0]) + + self.check_pixel_value(pipe.GetOutputTargets()[0].resourceId, 0.3, 0.5, [1.0, 0.0, 0.0, 1.0]) + self.check_pixel_value(pipe.GetOutputTargets()[0].resourceId, 0.7, 0.5, [1.0, 0.0, 0.0, 1.0]) + self.check_pixel_value(pipe.GetOutputTargets()[0].resourceId, 0.5, 0.8, [1.0, 0.0, 0.0, 1.0]) + self.check_pixel_value(pipe.GetOutputTargets()[0].resourceId, 0.5, 0.2, [1.0, 0.0, 0.0, 1.0]) + + rdtest.log.success("Picked values are as expected") \ No newline at end of file