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

Fix D3D11 to properly flush CB/SRVs when bindings new shaders after CB/SRV was set

Browse Source
This commit is contained in:
Wojtek Figat
2024-07-02 00:55:41 +02:00
parent 9486466abf
commit fe0711c3e2
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -583,6 +583,7 @@ void GPUContextDX11::SetState(GPUPipelineState* state)
} }
// Per pipeline stage state caching // Per pipeline stage state caching
bool shaderEnabled = false;
if (CurrentDepthStencilState != depthStencilState) if (CurrentDepthStencilState != depthStencilState)
{ {
CurrentDepthStencilState = depthStencilState; CurrentDepthStencilState = depthStencilState;
@@ -600,6 +601,7 @@ void GPUContextDX11::SetState(GPUPipelineState* state)
} }
if (CurrentVS != vs) if (CurrentVS != vs)
{ {
shaderEnabled |= CurrentVS == nullptr;
#if DX11_CLEAR_SR_ON_STAGE_DISABLE #if DX11_CLEAR_SR_ON_STAGE_DISABLE
if (CurrentVS && !vs) if (CurrentVS && !vs)
{ {
@@ -613,6 +615,7 @@ void GPUContextDX11::SetState(GPUPipelineState* state)
#if GPU_ALLOW_TESSELLATION_SHADERS #if GPU_ALLOW_TESSELLATION_SHADERS
if (CurrentHS != hs) if (CurrentHS != hs)
{ {
shaderEnabled |= CurrentHS == nullptr;
#if DX11_CLEAR_SR_ON_STAGE_DISABLE #if DX11_CLEAR_SR_ON_STAGE_DISABLE
if (CurrentHS && !hs) if (CurrentHS && !hs)
{ {
@@ -624,6 +627,7 @@ void GPUContextDX11::SetState(GPUPipelineState* state)
} }
if (CurrentDS != ds) if (CurrentDS != ds)
{ {
shaderEnabled |= CurrentDS == nullptr;
#if DX11_CLEAR_SR_ON_STAGE_DISABLE #if DX11_CLEAR_SR_ON_STAGE_DISABLE
if (CurrentDS && !ds) if (CurrentDS && !ds)
{ {
@@ -637,6 +641,7 @@ void GPUContextDX11::SetState(GPUPipelineState* state)
#if GPU_ALLOW_GEOMETRY_SHADERS #if GPU_ALLOW_GEOMETRY_SHADERS
if (CurrentGS != gs) if (CurrentGS != gs)
{ {
shaderEnabled |= CurrentGS == nullptr;
#if DX11_CLEAR_SR_ON_STAGE_DISABLE #if DX11_CLEAR_SR_ON_STAGE_DISABLE
if (CurrentGS && !gs) if (CurrentGS && !gs)
{ {
@@ -649,6 +654,7 @@ void GPUContextDX11::SetState(GPUPipelineState* state)
#endif #endif
if (CurrentPS != ps) if (CurrentPS != ps)
{ {
shaderEnabled |= CurrentPS == nullptr;
#if DX11_CLEAR_SR_ON_STAGE_DISABLE #if DX11_CLEAR_SR_ON_STAGE_DISABLE
if (CurrentPS && !ps) if (CurrentPS && !ps)
{ {
@@ -663,6 +669,13 @@ void GPUContextDX11::SetState(GPUPipelineState* state)
CurrentPrimitiveTopology = primitiveTopology; CurrentPrimitiveTopology = primitiveTopology;
_context->IASetPrimitiveTopology(primitiveTopology); _context->IASetPrimitiveTopology(primitiveTopology);
} }
if (shaderEnabled)
{
// Fix bug when binding constant buffer or texture, then binding PSO with tess and the drawing (data binded before tess shader is active was missing)
// TODO: use per-shader dirty flags
_cbDirtyFlag = true;
_srMaskDirtyGraphics = MAX_uint32;
}
RENDER_STAT_PS_STATE_CHANGE(); RENDER_STAT_PS_STATE_CHANGE();
} }