Fix test of D3D12 bindless feedback.

Fix a typo in a comment in D3D12_Descriptor_Indexing.py.
Fix UAV using a typed buffer view instead of a structured buffer view.
Fix SetDescriptorHeaps being called before ClearUnorderedAccessViewUint
This commit is contained in:
Benoit Dumesnil
2022-03-14 20:42:01 +01:00
committed by Baldur Karlsson
parent 29770ef762
commit e47450a43b
2 changed files with 6 additions and 5 deletions
@@ -255,9 +255,10 @@ float4 main(v2f IN) : SV_Target0
ID3D12ResourcePtr structBuf = MakeBuffer().UAV().Size(8192);
D3D12_GPU_DESCRIPTOR_HANDLE structGPU =
MakeUAV(structBuf).Format(DXGI_FORMAT_R32_UINT).CreateGPU(15);
MakeUAV(structBuf).Format(DXGI_FORMAT_R32_UINT).CreateGPU(16);
D3D12_CPU_DESCRIPTOR_HANDLE structCPU =
MakeUAV(structBuf).Format(DXGI_FORMAT_R32_UINT).CreateClearCPU(15);
MakeUAV(structBuf).Format(DXGI_FORMAT_R32_UINT).CreateClearCPU(16);
MakeUAV(structBuf).StructureStride(2 * sizeof(uint32_t)).CreateGPU(15);
MakeSRV(structBuf).StructureStride(2 * sizeof(uint32_t)).CreateGPU(8);
MakeSRV(smiley).CreateGPU(12);
@@ -291,11 +292,11 @@ float4 main(v2f IN) : SV_Target0
setMarker(cmd, markers[i]);
cmd->SetDescriptorHeaps(1, &m_CBVUAVSRV.GetInterfacePtr());
UINT zero[4] = {};
cmd->ClearUnorderedAccessViewUint(structGPU, structCPU, structBuf, zero, 0, NULL);
cmd->SetDescriptorHeaps(1, &m_CBVUAVSRV.GetInterfacePtr());
cmd->SetPipelineState(computepso[i]);
cmd->SetComputeRootSignature(computesig);
cmd->SetComputeRootDescriptorTable(0, m_CBVUAVSRV->GetGPUDescriptorHandleForHeapStart());
@@ -51,7 +51,7 @@ class D3D12_Descriptor_Indexing(rdtest.TestCase):
# Check bindings:
# - buffer 8 in root range 0 should be statically used (single fixed declaration) for the parameters
# image 15 in root range 0 should also be statically used
# image 12 in root range 0 should also be statically used
# - images 19, 20, 21 in root range 1 should be used for the non-uniform index
# images 49 & 59 in root range 1 should be used for a second array in the same range
# image 60 in root range 1 should be used for a fixed index in an array