From 3b62d8b326f43b73eb40fc207e618ad85156ce2c Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 22 Mar 2021 16:52:31 +0000 Subject: [PATCH] Account for overlapping ranges needing to be patched to another space --- renderdoc/driver/d3d12/d3d12_debug.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/renderdoc/driver/d3d12/d3d12_debug.cpp b/renderdoc/driver/d3d12/d3d12_debug.cpp index d9b94e7c4..206c8c988 100644 --- a/renderdoc/driver/d3d12/d3d12_debug.cpp +++ b/renderdoc/driver/d3d12/d3d12_debug.cpp @@ -2262,29 +2262,29 @@ void MoveRootSignatureElementsToRegisterSpace(D3D12RootSignature &sig, uint32_t D3D12_DESCRIPTOR_RANGE_TYPE rangeType = sig.Parameters[i].ranges[r].RangeType; if(rangeType == D3D12_DESCRIPTOR_RANGE_TYPE_CBV && type == D3D12DescriptorType::CBV) { - sig.Parameters[i].ranges[r].RegisterSpace = registerSpace; + sig.Parameters[i].ranges[r].RegisterSpace += registerSpace; } else if(rangeType == D3D12_DESCRIPTOR_RANGE_TYPE_SRV && type == D3D12DescriptorType::SRV) { - sig.Parameters[i].ranges[r].RegisterSpace = registerSpace; + sig.Parameters[i].ranges[r].RegisterSpace += registerSpace; } else if(rangeType == D3D12_DESCRIPTOR_RANGE_TYPE_UAV && type == D3D12DescriptorType::UAV) { - sig.Parameters[i].ranges[r].RegisterSpace = registerSpace; + sig.Parameters[i].ranges[r].RegisterSpace += registerSpace; } } } else if(rootType == D3D12_ROOT_PARAMETER_TYPE_CBV && type == D3D12DescriptorType::CBV) { - sig.Parameters[i].Descriptor.RegisterSpace = registerSpace; + sig.Parameters[i].Descriptor.RegisterSpace += registerSpace; } else if(rootType == D3D12_ROOT_PARAMETER_TYPE_SRV && type == D3D12DescriptorType::SRV) { - sig.Parameters[i].Descriptor.RegisterSpace = registerSpace; + sig.Parameters[i].Descriptor.RegisterSpace += registerSpace; } else if(rootType == D3D12_ROOT_PARAMETER_TYPE_UAV && type == D3D12DescriptorType::UAV) { - sig.Parameters[i].Descriptor.RegisterSpace = registerSpace; + sig.Parameters[i].Descriptor.RegisterSpace += registerSpace; } } }