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

Fix missing UAV barriers on D3D12

Browse Source
This commit is contained in:
Wojtek Figat
2021-06-07 13:09:24 +02:00
parent 39698c7694
commit 3872d74bd2
2 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,7 +93,6 @@ GPUContextDX12::~GPUContextDX12()
void GPUContextDX12::AddTransitionBarrier(ResourceOwnerDX12* resource, const D3D12_RESOURCE_STATES before, const D3D12_RESOURCE_STATES after, const int32 subresourceIndex)
{
// Check if need to flush barriers
if (_rbBufferSize == DX12_RB_BUFFER_SIZE)
flushRBs();
@@ -108,20 +107,6 @@ void GPUContextDX12::AddTransitionBarrier(ResourceOwnerDX12* resource, const D3D
Log::Logger::Write(LogType::Info, info);
#endif
#if DX12_ENABLE_RESOURCE_BARRIERS_BATCHING
// Enqueue barrier
D3D12_RESOURCE_BARRIER& barrier = _rbBuffer[_rbBufferSize];
barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE;
barrier.Transition.pResource = resource->GetResource();
barrier.Transition.StateBefore = before;
barrier.Transition.StateAfter = after;
barrier.Transition.Subresource = subresourceIndex;
_rbBufferSize++;
#else
D3D12_RESOURCE_BARRIER barrier;
barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE;
@@ -129,8 +114,31 @@ void GPUContextDX12::AddTransitionBarrier(ResourceOwnerDX12* resource, const D3D
barrier.Transition.StateBefore = before;
barrier.Transition.StateAfter = after;
barrier.Transition.Subresource = subresourceIndex;
#if DX12_ENABLE_RESOURCE_BARRIERS_BATCHING
_rbBuffer[_rbBufferSize++] = barrier;
#else
_commandList->ResourceBarrier(1, &barrier);
#endif
}
void GPUContextDX12::AddUAVBarrier()
{
if (_rbBufferSize == DX12_RB_BUFFER_SIZE)
flushRBs();
#if DX12_ENABLE_RESOURCE_BARRIERS_DEBUGGING
const auto info = String::Format(TEXT("[DX12 Resource Barrier]: UAV"));
Log::Logger::Write(LogType::Info, info);
#endif
D3D12_RESOURCE_BARRIER barrier;
barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_UAV;
barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE;
barrier.UAV.pResource = nullptr;
#if DX12_ENABLE_RESOURCE_BARRIERS_BATCHING
_rbBuffer[_rbBufferSize++] = barrier;
#else
_commandList->ResourceBarrier(1, &barrier);
#endif
}
@@ -916,6 +924,9 @@ void GPUContextDX12::Dispatch(GPUShaderProgramCS* shader, uint32 threadGroupCoun
// Restore previous state on next draw call
_psDirtyFlag = true;
// Insert UAV barrier to ensure proper memory access for multiple sequential dispatches
AddUAVBarrier();
}
void GPUContextDX12::DispatchIndirect(GPUShaderProgramCS* shader, GPUBuffer* bufferForArgs, uint32 offsetForArgs)
@@ -946,6 +957,9 @@ void GPUContextDX12::DispatchIndirect(GPUShaderProgramCS* shader, GPUBuffer* buf
// Restore previous state on next draw call
_psDirtyFlag = true;
// Insert UAV barrier to ensure proper memory access for multiple sequential dispatches
AddUAVBarrier();
}
void GPUContextDX12::ResolveMultisample(GPUTexture* sourceMultisampleTexture, GPUTexture* destTexture, int32 sourceSubResource, int32 destSubResource, PixelFormat format)

5
Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.h
View File

@@ -102,6 +102,11 @@ public:
/// <param name="subresourceIndex">The index of the subresource.</param>
void AddTransitionBarrier(ResourceOwnerDX12* resource, const D3D12_RESOURCE_STATES before, const D3D12_RESOURCE_STATES after, const int32 subresourceIndex);
/// <summary>
/// Adds the UAV barrier. Supports batching barriers.
/// </summary>
void AddUAVBarrier();
/// <summary>
/// Set DirectX 12 resource state using resource barrier
/// </summary>