GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when using more than 2 constant buffers with D3D12

Browse Source
This commit is contained in:
Wojciech Figat
2022-07-01 13:19:38 +02:00
parent e2319ceca3
commit 427c3a9099
3 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.cpp
View File

@@ -346,9 +346,9 @@ void GPUContextDX12::flushSRVs()
// Flush SRV descriptors table
if (_isCompute)
_commandList->SetComputeRootDescriptorTable(2, allocation.GPU);
_commandList->SetComputeRootDescriptorTable(DX12_ROOT_SIGNATURE_SR, allocation.GPU);
else
_commandList->SetGraphicsRootDescriptorTable(2, allocation.GPU);
_commandList->SetGraphicsRootDescriptorTable(DX12_ROOT_SIGNATURE_SR, allocation.GPU);
}
void GPUContextDX12::flushRTVs()
@@ -448,9 +448,9 @@ void GPUContextDX12::flushUAVs()
// Flush UAV descriptors table
if (_isCompute)
_commandList->SetComputeRootDescriptorTable(3, allocation.GPU);
_commandList->SetComputeRootDescriptorTable(DX12_ROOT_SIGNATURE_UA, allocation.GPU);
else
_commandList->SetGraphicsRootDescriptorTable(3, allocation.GPU);
_commandList->SetGraphicsRootDescriptorTable(DX12_ROOT_SIGNATURE_UA, allocation.GPU);
}
void GPUContextDX12::flushCBs()
@@ -464,7 +464,7 @@ void GPUContextDX12::flushCBs()
if (cb)
{
ASSERT(cb->GPUAddress != 0);
_commandList->SetGraphicsRootConstantBufferView(i, cb->GPUAddress);
_commandList->SetGraphicsRootConstantBufferView(DX12_ROOT_SIGNATURE_CB + i, cb->GPUAddress);
}
}
}
@@ -477,7 +477,7 @@ void GPUContextDX12::flushCBs()
if (cb)
{
ASSERT(cb->GPUAddress != 0);
_commandList->SetComputeRootConstantBufferView(i, cb->GPUAddress);
_commandList->SetComputeRootConstantBufferView(DX12_ROOT_SIGNATURE_CB + i, cb->GPUAddress);
}
}
}
@@ -513,9 +513,9 @@ void GPUContextDX12::flushSamplers()
auto allocation = _device->RingHeap_Sampler.AllocateTable(samplersCount);
_device->GetDevice()->CopyDescriptors(1, &allocation.CPU, &samplersCount, samplersCount, srcDescriptorRangeStarts, nullptr, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER);
if (_isCompute)
_commandList->SetComputeRootDescriptorTable(4, allocation.GPU);
_commandList->SetComputeRootDescriptorTable(DX12_ROOT_SIGNATURE_SAMPLER, allocation.GPU);
else
_commandList->SetGraphicsRootDescriptorTable(4, allocation.GPU);
_commandList->SetGraphicsRootDescriptorTable(DX12_ROOT_SIGNATURE_SAMPLER, allocation.GPU);
}
void GPUContextDX12::flushRBs()