lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 09:00:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a D3D12 EI test case for an EI which does not need a root signature

Browse Source 
EI with:

D3D12_VERTEX_BUFFER_VIEW
D3D12_DRAW_ARGUMENTS
This commit is contained in:
Jake Turner
2025-11-20 15:41:32 +13:00
parent 67fc8618a7
commit a9056f1eca
2 changed files with 72 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/test/demos/d3d12/d3d12_execute_indirect.cpp
+60
View File
@@ -340,6 +340,37 @@ void main(uint3 gid : SV_GroupID)
ID3D12PipelineStatePtr patchpso =
MakePSO().RootSig(patchsig).InputLayout(layout).VS(vsblob).PS(psblob);
ID3D12CommandSignaturePtr patchArgSig2 = MakeCommandSig({}, {vbArg(0), drawArg()});
struct PatchArgs2
{
D3D12_VERTEX_BUFFER_VIEW vb;
D3D12_DRAW_ARGUMENTS draw;
} patchargs2;
patchargs2.vb.BufferLocation = vb->GetGPUVirtualAddress();
patchargs2.vb.SizeInBytes = sizeof(tri);
patchargs2.vb.StrideInBytes = sizeof(A2V);
patchargs2.draw.VertexCountPerInstance = 3;
patchargs2.draw.InstanceCount = 1;
patchargs2.draw.StartInstanceLocation = 0;
patchargs2.draw.StartVertexLocation = 0;
std::vector<char> patchArgsData2;
patchArgsData2.resize(sizeof(PatchArgs2));
char *ptr2 = patchArgsData2.data();
memcpy(ptr2, &patchargs2.vb, sizeof(D3D12_VERTEX_BUFFER_VIEW));
ptr2 += sizeof(D3D12_VERTEX_BUFFER_VIEW);
memcpy(ptr2, &patchargs2.draw, sizeof(D3D12_DRAW_ARGUMENTS));
ptr2 += sizeof(D3D12_DRAW_ARGUMENTS);
ID3D12ResourcePtr patchArgBuf2 =
MakeBuffer().Upload().Size((UINT)patchArgsData2.size()).Data(patchArgsData2.data());
ID3D12PipelineStatePtr patchpso2 =
MakePSO().RootSig(patchsig).InputLayout(layout).VS(vsblob).PS(psblob);
ID3D12CommandSignaturePtr compArgSig = MakeCommandSig(NULL, {dispatchArg()});
D3D12_DISPATCH_ARGUMENTS compargs;
@@ -452,6 +483,35 @@ void main(uint3 gid : SV_GroupID)
Reset(cmd);
cmds.push_back(cmd);
pushMarker(cmd, "EI without Root Signature");
{
cmd->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
cmd->SetPipelineState(patchpso2);
cmd->SetGraphicsRootSignature(patchsig);
cmd->SetDescriptorHeaps(1, &m_CBVUAVSRV.GetInterfacePtr());
cmd->SetGraphicsRootDescriptorTable(4, m_CBVUAVSRV->GetGPUDescriptorHandleForHeapStart());
cmd->SetGraphicsRootConstantBufferView(0, cbv->GetGPUVirtualAddress() + 256);
cmd->SetGraphicsRootShaderResourceView(1, srv->GetGPUVirtualAddress() + 256);
cmd->SetGraphicsRootUnorderedAccessView(2, uav->GetGPUVirtualAddress() + 256);
RSSetViewport(cmd, {0.0f, 0.0f, (float)screenWidth, (float)screenHeight, 0.0f, 1.0f});
RSSetScissorRect(cmd, {0, 0, screenWidth, screenHeight});
OMSetRenderTargets(cmd, {rtv}, {});
cmd->SetGraphicsRoot32BitConstants(3, 4, baseConstData, 0);
cmd->ExecuteIndirect(patchArgSig2, 1, patchArgBuf2, 0, NULL, 0);
}
popMarker(cmd);
cmd->Close();
cmd = GetCommandBuffer();
Reset(cmd);
cmds.push_back(cmd);
setMarker(cmd, "Separate Post draw");
pushMarker(cmd, "Single dispatch");
util/test/tests/D3D12/D3D12_Execute_Indirect.py
+12
View File
@@ -32,6 +32,18 @@ class D3D12_Execute_Indirect(rdtest.TestCase):
rdtest.log.success("rootConsts is as expected")
def check_capture(self):
action = self.find_action("EI without Root Signature");
self.controller.SetFrameEvent(action.eventId, False)
action = self.find_action("IndirectDraw", action.eventId)
for drawNum in range(3):
self.controller.SetFrameEvent(action.eventId + drawNum, False)
pipe = self.controller.GetPipelineState()
if len(pipe.GetOutputTargets()) != 1:
raise rdtest.TestFailureException(
f"With event {action.eventId + drawNum} selected we should have one output target but there is {len(pipe.GetOutputTargets())}")
self.check_pixel_history_succeeds()
rdtest.log.success("Fully used argument buffer with multiple draws replayed")
from_eid = self.find_action("Multiple draws").eventId
ei_eid = self.find_action("ExecuteIndirect", from_eid).eventId
self.controller.SetFrameEvent(ei_eid - 1, False)