From b49e2e607f6fb7fc5766faf6b910b9a088c4226f Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 3 Oct 2024 12:00:09 +0100
Subject: [PATCH] Add test of very short-lived RTV/DSV heaps

---
 util/test/demos/d3d12/d3d12_parameter_zoo.cpp | 43 ++++++++++++++++++-
 util/test/tests/D3D12/D3D12_Parameter_Zoo.py  | 31 ++++++++++++-
 2 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/util/test/demos/d3d12/d3d12_parameter_zoo.cpp b/util/test/demos/d3d12/d3d12_parameter_zoo.cpp
index 53c892536..045822f1a 100644
--- a/util/test/demos/d3d12/d3d12_parameter_zoo.cpp
+++ b/util/test/demos/d3d12/d3d12_parameter_zoo.cpp
@@ -231,6 +231,15 @@ void main()
     dev->CreateShaderResourceView(NULL, &srvDesc, descHeap->GetCPUDescriptorHandleForHeapStart());
 
     ID3D12PipelineStatePtr pso = psoCreator;
+
+    psoCreator.DSV(DXGI_FORMAT_D32_FLOAT);
+
+    ID3D12PipelineStatePtr psoDepth = psoCreator;
+
+    ID3D12ResourcePtr dsvtex = MakeTexture(DXGI_FORMAT_D32_FLOAT, screenWidth, screenHeight)
+                                   .DSV()
+                                   .InitialState(D3D12_RESOURCE_STATE_DEPTH_WRITE);
+
     ID3D12PipelineStatePtr pso2;
 
     if(dev2)
@@ -460,15 +469,45 @@ void main()
 
       cmd->DrawIndexedInstanced(3, 1, 0, 0, 0);
 
-      FinishUsingBackbuffer(cmd, D3D12_RESOURCE_STATE_RENDER_TARGET);
-
       uint32_t b[4] = {111, 111, 111, 111};
 
+      setMarker(cmd, "No Sig Dispatch");
+
       cmd->SetPipelineState(psoCompNoSig);
       cmd->SetComputeRootSignature(compsig);
       cmd->SetComputeRootUnorderedAccessView(0, bufout->GetGPUVirtualAddress());
       cmd->Dispatch(1, 1, 1);
 
+      // use a temporary RTV/DSV heap to bind
+      {
+        D3D12_DESCRIPTOR_HEAP_DESC desc;
+        desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
+        desc.NodeMask = 1;
+        desc.NumDescriptors = 1;
+        desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV;
+
+        ID3D12DescriptorHeapPtr rtvTemp;
+        CHECK_HR(dev->CreateDescriptorHeap(&desc, __uuidof(ID3D12DescriptorHeap), (void **)&rtvTemp));
+
+        desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_DSV;
+
+        ID3D12DescriptorHeapPtr dsvTemp;
+        CHECK_HR(dev->CreateDescriptorHeap(&desc, __uuidof(ID3D12DescriptorHeap), (void **)&dsvTemp));
+
+        D3D12_CPU_DESCRIPTOR_HANDLE rtvTempHandle =
+            MakeRTV(bb).Format(DXGI_FORMAT_R8G8B8A8_UNORM_SRGB).CreateCPU(rtvTemp, 0);
+        D3D12_CPU_DESCRIPTOR_HANDLE dsvTempHandle = MakeDSV(dsvtex).CreateCPU(dsvTemp, 0);
+
+        cmd->OMSetRenderTargets(1, &rtvTempHandle, FALSE, &dsvTempHandle);
+      }
+
+      setMarker(cmd, "Temp heap Draw");
+
+      cmd->SetPipelineState(psoDepth);
+      cmd->DrawIndexedInstanced(3, 1, 0, 0, 0);
+
+      FinishUsingBackbuffer(cmd, D3D12_RESOURCE_STATE_RENDER_TARGET);
+
       cmd->Close();
 
       Submit({cmd});
diff --git a/util/test/tests/D3D12/D3D12_Parameter_Zoo.py b/util/test/tests/D3D12/D3D12_Parameter_Zoo.py
index e09229627..f7a7153c0 100644
--- a/util/test/tests/D3D12/D3D12_Parameter_Zoo.py
+++ b/util/test/tests/D3D12/D3D12_Parameter_Zoo.py
@@ -96,4 +96,33 @@ class D3D12_Parameter_Zoo(rdtest.TestCase):
         # MinLod
         self.check(desc1234.GetChild(8).AsFloat() == 1.5)
 
-        rdtest.log.success("Overlay color is as expected")
\ No newline at end of file
+        rdtest.log.success("Overlay color is as expected")
+
+        action = self.find_action("No Sig Draw")
+        action = action.next
+        
+        self.controller.SetFrameEvent(action.eventId, False)
+
+        pipe: rd.PipeState = self.controller.GetPipelineState()
+
+        self.check_pixel_value(pipe.GetOutputTargets()[0].resource, 0.5, 0.5, [0.0, 1.0, 0.0, 1.0])
+
+        rdtest.log.success("No sig draw worked as expected")
+
+        action = self.find_action("No Sig Dispatch")
+        action = action.next
+        
+        self.controller.SetFrameEvent(action.eventId, False)
+
+        # nothing to actually check here
+
+        action = self.find_action("Temp heap Draw")
+        action = action.next
+        
+        self.controller.SetFrameEvent(action.eventId, False)
+
+        pipe: rd.PipeState = self.controller.GetPipelineState()
+
+        self.check_pixel_value(pipe.GetOutputTargets()[0].resource, 0.5, 0.5, [0.0, 1.0, 0.0, 1.0])
+
+        rdtest.log.success("Temp heap worked as expected")
\ No newline at end of file