diff --git a/util/test/demos/d3d11/d3d11_untyped_backbuffer_descriptor.cpp b/util/test/demos/d3d11/d3d11_untyped_backbuffer_descriptor.cpp new file mode 100644 index 000000000..b594793ec --- /dev/null +++ b/util/test/demos/d3d11/d3d11_untyped_backbuffer_descriptor.cpp @@ -0,0 +1,85 @@ +/****************************************************************************** + * The MIT License (MIT) + * + * Copyright (c) 2015-2019 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 "d3d11_test.h" + +TEST(D3D11_Untyped_Backbuffer_Descriptor, D3D11GraphicsTest) +{ + static constexpr const char *Description = + "Just draws a simple triangle, using normal pipeline. Basic test that can be used " + "for any dead-simple tests that don't require any particular API use"; + + int main() + { + // initialise, create window, create device, etc + if(!Init()) + return 3; + + ID3DBlobPtr vsblob = Compile(D3DDefaultVertex, "main", "vs_4_0"); + ID3DBlobPtr psblob = Compile("float4 main() : SV_Target0 { return 1.0f; }", "main", "ps_4_0"); + + CreateDefaultInputLayout(vsblob); + + ID3D11VertexShaderPtr vs = CreateVS(vsblob); + ID3D11PixelShaderPtr ps = CreatePS(psblob); + + ID3D11BufferPtr vb = MakeBuffer().Vertex().Data(DefaultTri); + + ID3D11RenderTargetViewPtr UnknownFormatDescRTV = MakeRTV(bbTex).Format(DXGI_FORMAT_UNKNOWN); + + ID3D11RenderTargetViewPtr NULLDescRTV; + dev->CreateRenderTargetView(bbTex, NULL, &NULLDescRTV); + + while(Running()) + { + ClearRenderTargetView(bbRTV, {0.4f, 0.5f, 0.6f, 1.0f}); + + IASetVertexBuffer(vb, sizeof(DefaultA2V), 0); + ctx->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ctx->IASetInputLayout(defaultLayout); + + ctx->VSSetShader(vs, NULL, 0); + ctx->PSSetShader(ps, NULL, 0); + + RSSetViewport({0.0f, 0.0f, (float)screenWidth / 2.0f, (float)screenHeight, 0.0f, 1.0f}); + + ctx->OMSetRenderTargets(1, &UnknownFormatDescRTV.GetInterfacePtr(), NULL); + + ctx->Draw(3, 0); + + RSSetViewport({(float)screenWidth / 2.0f, 0.0f, (float)screenWidth / 2.0f, + (float)screenHeight, 0.0f, 1.0f}); + + ctx->OMSetRenderTargets(1, &NULLDescRTV.GetInterfacePtr(), NULL); + + ctx->Draw(3, 0); + + Present(); + } + + return 0; + } +}; + +REGISTER_TEST(); diff --git a/util/test/demos/d3d12/d3d12_untyped_backbuffer_descriptor.cpp b/util/test/demos/d3d12/d3d12_untyped_backbuffer_descriptor.cpp new file mode 100644 index 000000000..c487e5175 --- /dev/null +++ b/util/test/demos/d3d12/d3d12_untyped_backbuffer_descriptor.cpp @@ -0,0 +1,101 @@ +/****************************************************************************** + * The MIT License (MIT) + * + * Copyright (c) 2018-2019 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" + +TEST(D3D12_Untyped_Backbuffer_Descriptor, D3D12GraphicsTest) +{ + static constexpr const char *Description = + "D3D12 inherits D3D11's ability to have a mutable format on a non-typeless backbuffer " + "texture. Test that this works for both a NULL descriptor and a descriptor with an UNKNOWN " + "format"; + + int main() + { + // initialise, create window, create device, etc + if(!Init()) + return 3; + + ID3DBlobPtr vsblob = Compile(D3DDefaultVertex, "main", "vs_4_0"); + ID3DBlobPtr psblob = Compile("float4 main() : SV_Target0 { return 1.0f; }", "main", "ps_4_0"); + + ID3D12ResourcePtr vb = MakeBuffer().Data(DefaultTri); + + ID3D12RootSignaturePtr sig = MakeSig({}); + + ID3D12PipelineStatePtr pso = + MakePSO().RootSig(sig).InputLayout().VS(vsblob).PS(psblob).RTVs({DXGI_FORMAT_R8G8B8A8_UNORM}); + + 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); + + // create a descriptor with an UNKNOWN format + D3D12_CPU_DESCRIPTOR_HANDLE rtv = MakeRTV(bb).Format(DXGI_FORMAT_UNKNOWN).CreateCPU(0); + + ClearRenderTargetView(cmd, rtv, {0.4f, 0.5f, 0.6f, 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 / 2.0f, (float)screenHeight, 0.0f, 1.0f}); + RSSetScissorRect(cmd, {0, 0, screenWidth, screenHeight}); + + OMSetRenderTargets(cmd, {rtv}, {}); + + cmd->DrawInstanced(3, 1, 0, 0); + + // create a descriptor with no descriptor at all + dev->CreateRenderTargetView(bb, NULL, rtv); + + OMSetRenderTargets(cmd, {rtv}, {}); + + RSSetViewport(cmd, {(float)screenWidth / 2.0f, 0.0f, (float)screenWidth / 2.0f, + (float)screenHeight, 0.0f, 1.0f}); + + 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/demos.vcxproj b/util/test/demos/demos.vcxproj index 20a62e914..7edb2c6b1 100644 --- a/util/test/demos/demos.vcxproj +++ b/util/test/demos/demos.vcxproj @@ -152,6 +152,7 @@ + @@ -160,6 +161,7 @@ + diff --git a/util/test/demos/demos.vcxproj.filters b/util/test/demos/demos.vcxproj.filters index 921be93a9..de22f0559 100644 --- a/util/test/demos/demos.vcxproj.filters +++ b/util/test/demos/demos.vcxproj.filters @@ -300,6 +300,12 @@ D3D11\demos + + D3D12\demos + + + D3D11\demos + diff --git a/util/test/tests/D3D11/D3D11_Untyped_Backbuffer_Descriptor.py b/util/test/tests/D3D11/D3D11_Untyped_Backbuffer_Descriptor.py new file mode 100644 index 000000000..96f5c82aa --- /dev/null +++ b/util/test/tests/D3D11/D3D11_Untyped_Backbuffer_Descriptor.py @@ -0,0 +1,52 @@ +import renderdoc as rd +import rdtest + + +class D3D11_Untyped_Backbuffer_Descriptor(rdtest.TestCase): + demos_test_name = 'D3D11_Untyped_Backbuffer_Descriptor' + + def check_capture(self): + # Make an output so we can pick pixels + out: rd.ReplayOutput = self.controller.CreateOutput(rd.CreateHeadlessWindowingData(100, 100), rd.ReplayOutputType.Texture) + + self.check(out is not None) + + # find the first draw + draw = self.find_draw("Draw") + + # check the centre pixel of the viewport is white + self.controller.SetFrameEvent(draw.eventId, False) + + pipe: rd.PipeState = self.controller.GetPipelineState() + + tex = rd.TextureDisplay() + tex.resourceId = pipe.GetOutputTargets()[0].resourceId + out.SetTextureDisplay(tex) + + view: rd.Viewport = pipe.GetViewport(0) + + picked: rd.PixelValue = out.PickPixel(tex.resourceId, False, + int(view.width / 2), int(view.height / 2), 0, 0, 0) + + if not rdtest.value_compare(picked.floatValue, [1.0, 1.0, 1.0, 1.0]): + raise rdtest.TestFailureException("Picked value {} doesn't match expectation".format(picked.floatValue)) + + rdtest.log.success("Picked value for first draw is as expected") + + # find the second draw + draw = self.find_draw("Draw", draw.eventId+1) + + pipe: rd.PipeState = self.controller.GetPipelineState() + + tex.resourceId = pipe.GetOutputTargets()[0].resourceId + out.SetTextureDisplay(tex) + + view: rd.Viewport = pipe.GetViewport(0) + + picked: rd.PixelValue = out.PickPixel(tex.resourceId, False, + int(view.width / 2), int(view.height / 2), 0, 0, 0) + + if not rdtest.value_compare(picked.floatValue, [1.0, 1.0, 1.0, 1.0]): + raise rdtest.TestFailureException("Picked value {} doesn't match expectation".format(picked.floatValue)) + + rdtest.log.success("Picked value for second draw is as expected") diff --git a/util/test/tests/D3D12/D3D12_Untyped_Backbuffer_Descriptor.py b/util/test/tests/D3D12/D3D12_Untyped_Backbuffer_Descriptor.py new file mode 100644 index 000000000..d567e97a2 --- /dev/null +++ b/util/test/tests/D3D12/D3D12_Untyped_Backbuffer_Descriptor.py @@ -0,0 +1,52 @@ +import renderdoc as rd +import rdtest + + +class D3D12_Untyped_Backbuffer_Descriptor(rdtest.TestCase): + demos_test_name = 'D3D12_Untyped_Backbuffer_Descriptor' + + def check_capture(self): + # Make an output so we can pick pixels + out: rd.ReplayOutput = self.controller.CreateOutput(rd.CreateHeadlessWindowingData(100, 100), rd.ReplayOutputType.Texture) + + self.check(out is not None) + + # find the first draw + draw = self.find_draw("Draw") + + # check the centre pixel of the viewport is white + self.controller.SetFrameEvent(draw.eventId, False) + + pipe: rd.PipeState = self.controller.GetPipelineState() + + tex = rd.TextureDisplay() + tex.resourceId = pipe.GetOutputTargets()[0].resourceId + out.SetTextureDisplay(tex) + + view: rd.Viewport = pipe.GetViewport(0) + + picked: rd.PixelValue = out.PickPixel(tex.resourceId, False, + int(view.width / 2), int(view.height / 2), 0, 0, 0) + + if not rdtest.value_compare(picked.floatValue, [1.0, 1.0, 1.0, 1.0]): + raise rdtest.TestFailureException("Picked value {} doesn't match expectation".format(picked.floatValue)) + + rdtest.log.success("Picked value for first draw is as expected") + + # find the second draw + draw = self.find_draw("Draw", draw.eventId+1) + + pipe: rd.PipeState = self.controller.GetPipelineState() + + tex.resourceId = pipe.GetOutputTargets()[0].resourceId + out.SetTextureDisplay(tex) + + view: rd.Viewport = pipe.GetViewport(0) + + picked: rd.PixelValue = out.PickPixel(tex.resourceId, False, + int(view.width / 2), int(view.height / 2), 0, 0, 0) + + if not rdtest.value_compare(picked.floatValue, [1.0, 1.0, 1.0, 1.0]): + raise rdtest.TestFailureException("Picked value {} doesn't match expectation".format(picked.floatValue)) + + rdtest.log.success("Picked value for second draw is as expected")