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

Various small fixes and improvements

Browse Source
This commit is contained in:
Wojtek Figat
2025-09-04 15:56:33 +02:00
parent 3e363c8275
commit cd22cd059d
7 changed files with 43 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Source/Engine/GraphicsDevice/DirectX/DX11/GPUContextDX11.cpp
View File

@@ -95,6 +95,7 @@ void GPUContextDX11::FrameBegin()
GPUContext::FrameBegin();
// Setup
_flushOnDispatch = false;
_omDirtyFlag = false;
_uaDirtyFlag = false;
_cbDirtyFlag = false;
@@ -497,50 +498,19 @@ void GPUContextDX11::UpdateCB(GPUConstantBuffer* cb, const void* data)
void GPUContextDX11::Dispatch(GPUShaderProgramCS* shader, uint32 threadGroupCountX, uint32 threadGroupCountY, uint32 threadGroupCountZ)
{
CurrentCS = (GPUShaderProgramCSDX11*)shader;
// Flush
flushCBs();
flushSRVs();
flushUAVs();
flushOM();
// Dispatch
auto compute = (ID3D11ComputeShader*)shader->GetBufferHandle();
if (_currentCompute != compute)
{
_currentCompute = compute;
_context->CSSetShader(compute, nullptr, 0);
}
onDispatch(shader);
_context->Dispatch(threadGroupCountX, threadGroupCountY, threadGroupCountZ);
RENDER_STAT_DISPATCH_CALL();
CurrentCS = nullptr;
}
void GPUContextDX11::DispatchIndirect(GPUShaderProgramCS* shader, GPUBuffer* bufferForArgs, uint32 offsetForArgs)
{
ASSERT(bufferForArgs && EnumHasAnyFlags(bufferForArgs->GetFlags(), GPUBufferFlags::Argument));
CurrentCS = (GPUShaderProgramCSDX11*)shader;
auto bufferForArgsDX11 = (GPUBufferDX11*)bufferForArgs;
// Flush
flushCBs();
flushSRVs();
flushUAVs();
flushOM();
// Dispatch
auto compute = (ID3D11ComputeShader*)shader->GetBufferHandle();
if (_currentCompute != compute)
{
_currentCompute = compute;
_context->CSSetShader(compute, nullptr, 0);
}
onDispatch(shader);
_context->DispatchIndirect(bufferForArgsDX11->GetBuffer(), offsetForArgs);
RENDER_STAT_DISPATCH_CALL();
CurrentCS = nullptr;
}
@@ -921,6 +891,7 @@ void GPUContextDX11::OverlapUA(bool end)
NvAPI_D3D11_EndUAVOverlap(_context);
else
NvAPI_D3D11_BeginUAVOverlap(_context);
_flushOnDispatch |= end;
return;
}
#endif
@@ -931,6 +902,7 @@ void GPUContextDX11::OverlapUA(bool end)
agsDriverExtensionsDX11_EndUAVOverlap(AgsContext, _context);
else
agsDriverExtensionsDX11_BeginUAVOverlap(AgsContext, _context);
_flushOnDispatch |= end;
return;
}
#endif
@@ -1046,6 +1018,7 @@ void GPUContextDX11::flushIA()
void GPUContextDX11::onDrawCall()
{
_flushOnDispatch = false;
flushCBs();
flushSRVs();
flushUAVs();
@@ -1053,4 +1026,27 @@ void GPUContextDX11::onDrawCall()
flushOM();
}
void GPUContextDX11::onDispatch(GPUShaderProgramCS* shader)
{
CurrentCS = (GPUShaderProgramCSDX11*)shader;
flushCBs();
flushSRVs();
flushUAVs();
flushOM();
if (_flushOnDispatch)
{
_flushOnDispatch = false;
_context->Flush();
}
auto compute = (ID3D11ComputeShader*)shader->GetBufferHandle();
if (_currentCompute != compute)
{
_currentCompute = compute;
_context->CSSetShader(compute, nullptr, 0);
}
}
#endif

2
Source/Engine/GraphicsDevice/DirectX/DX11/GPUContextDX11.h
View File

@@ -30,6 +30,7 @@ private:
byte _tracyZone[TracyD3D11ZoneSize];
#endif
int32 _maxUASlots;
bool _flushOnDispatch;
// Output Merger
bool _omDirtyFlag;
@@ -111,6 +112,7 @@ private:
void flushOM();
void flushIA();
void onDrawCall();
void onDispatch(GPUShaderProgramCS* shader);
public:

2
Source/Engine/GraphicsDevice/DirectX/DX12/GPUBufferDX12.cpp
View File

@@ -38,7 +38,7 @@ void* GPUBufferDX12::Map(GPUResourceMapMode mode)
{
D3D12_RANGE readRange;
D3D12_RANGE* readRangePtr;
switch (mode)
switch (mode & GPUResourceMapMode::ReadWrite)
{
case GPUResourceMapMode::Read:
readRangePtr = nullptr;