Using dirty bit notification for D3D11 scissor rectangle state

src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp

@@ -1441,31 +1441,7 @@ gl::Error Renderer11::setDepthStencilState(const gl::State &glState)
 
 void Renderer11::setScissorRectangle(const gl::Rectangle &scissor, bool enabled)
 {
-    if (mForceSetScissor || memcmp(&scissor, &mCurScissor, sizeof(gl::Rectangle)) != 0 ||
-        enabled != mScissorEnabled)
-    {
-        if (enabled)
-        {
-            D3D11_RECT rect;
-            rect.left = std::max(0, scissor.x);
-            rect.top = std::max(0, scissor.y);
-            rect.right = scissor.x + std::max(0, scissor.width);
-            rect.bottom = scissor.y + std::max(0, scissor.height);
-
-            mDeviceContext->RSSetScissorRects(1, &rect);
-        }
-
-        if (enabled != mScissorEnabled)
-        {
-            mStateManager.forceSetRasterState();
-        }
-
-        mCurScissor = scissor;
-        mScissorEnabled = enabled;
-        mStateManager.setCurScissorEnabled(mScissorEnabled);
-    }
-
-    mForceSetScissor = false;
+    mStateManager.setScissorRectangle(scissor, enabled);
 }
 
 void Renderer11::setViewport(const gl::Rectangle &viewport, float zNear, float zFar, GLenum drawMode, GLenum frontFace,
@@ -1728,7 +1704,6 @@ gl::Error Renderer11::applyRenderTarget(const gl::Framebuffer *framebuffer)
         mRenderTargetDesc.height = renderTargetHeight;
         mRenderTargetDesc.format = renderTargetFormat;
         mForceSetViewport = true;
-        mForceSetScissor = true;
         mStateManager.forceSetBlendState();
 
         if (!mDepthStencilInitialized)
@@ -2525,7 +2500,7 @@ void Renderer11::markAllStateDirty()
     mStateManager.forceSetBlendState();
     mStateManager.forceSetDepthStencilState();
     mStateManager.forceSetRasterState();
-    mForceSetScissor = true;
+    mStateManager.forceSetScissorState();
     mForceSetViewport = true;
 
     mAppliedIB = NULL;

src/libANGLE/renderer/d3d/d3d11/Renderer11.h

@@ -413,11 +413,6 @@ class Renderer11 : public RendererD3D
 
     StateManager11 mStateManager;
 
-    // Currently applied scissor rectangle
-    bool mForceSetScissor;
-    bool mScissorEnabled;
-    gl::Rectangle mCurScissor;
-
     // Currently applied viewport
     bool mForceSetViewport;
     gl::Rectangle mCurViewport;

src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp

@@ -23,7 +23,9 @@ StateManager11::StateManager11()
       mCurStencilBackRef(0),
       mCurStencilSize(0),
       mRasterizerStateIsDirty(false),
+      mScissorStateIsDirty(false),
       mCurScissorEnabled(false),
+      mCurScissorRect(),
       mDeviceContext(nullptr),
       mStateCache(nullptr)
 {
@@ -280,6 +282,20 @@ void StateManager11::syncState(const gl::State &state, const gl::State::DirtyBit
                     mRasterizerStateIsDirty = true;
                 }
                 break;
+            case gl::State::DIRTY_BIT_SCISSOR:
+                if (state.getScissor() != mCurScissorRect)
+                {
+                    mScissorStateIsDirty = true;
+                }
+                break;
+            case gl::State::DIRTY_BIT_SCISSOR_TEST_ENABLED:
+                if (state.isScissorTestEnabled() != mCurScissorEnabled)
+                {
+                    mScissorStateIsDirty = true;
+                    // Rasterizer state update needs mCurScissorsEnabled and updates when it changes
+                    mRasterizerStateIsDirty = true;
+                }
+                break;
             default:
                 break;
         }
@@ -291,8 +307,11 @@ gl::Error StateManager11::setBlendState(const gl::Framebuffer *framebuffer,
                                         const gl::ColorF &blendColor,
                                         unsigned int sampleMask)
 {
-    if (mBlendStateIsDirty || sampleMask != mCurSampleMask)
+    if (!mBlendStateIsDirty && sampleMask == mCurSampleMask)
     {
+        return gl::Error(GL_NO_ERROR);
+    }
+
     ID3D11BlendState *dxBlendState = nullptr;
     gl::Error error = mStateCache->getBlendState(framebuffer, blendState, &dxBlendState);
     if (error.isError())
@@ -328,9 +347,8 @@ gl::Error StateManager11::setBlendState(const gl::Framebuffer *framebuffer,
     mCurSampleMask = sampleMask;
 
     mBlendStateIsDirty = false;
-    }
 
-    return gl::Error(GL_NO_ERROR);
+    return error;
 }
 
 gl::Error StateManager11::setDepthStencilState(const gl::State &glState)
@@ -346,10 +364,13 @@ gl::Error StateManager11::setDepthStencilState(const gl::State &glState)
     bool disableStencil = (fbo.hasDepth() && !fbo.hasStencil());
 
     // CurDisableDepth/Stencil are reset automatically after we call forceSetDepthStencilState.
-    if (mDepthStencilStateIsDirty || !mCurDisableDepth.valid() ||
-        disableDepth != mCurDisableDepth.value() || !mCurDisableStencil.valid() ||
-        disableStencil != mCurDisableStencil.value())
+    if (!mDepthStencilStateIsDirty && mCurDisableDepth.valid() &&
+        disableDepth == mCurDisableDepth.value() && mCurDisableStencil.valid() &&
+        disableStencil == mCurDisableStencil.value())
     {
+        return gl::Error(GL_NO_ERROR);
+    }
+
     const auto &depthStencilState = glState.getDepthStencilState();
     int stencilRef                = glState.getStencilRef();
     int stencilBackRef            = glState.getStencilBackRef();
@@ -395,15 +416,17 @@ gl::Error StateManager11::setDepthStencilState(const gl::State &glState)
     mCurDisableStencil    = disableStencil;
 
     mDepthStencilStateIsDirty = false;
-    }
 
     return gl::Error(GL_NO_ERROR);
 }
 
 gl::Error StateManager11::setRasterizerState(const gl::RasterizerState &rasterState)
 {
-    if (mRasterizerStateIsDirty)
+    if (!mRasterizerStateIsDirty)
     {
+        return gl::Error(GL_NO_ERROR);
+    }
+
     ID3D11RasterizerState *dxRasterState = nullptr;
     gl::Error error =
         mStateCache->getRasterizerState(rasterState, mCurScissorEnabled, &dxRasterState);
@@ -416,9 +439,29 @@ gl::Error StateManager11::setRasterizerState(const gl::RasterizerState &rasterSt
 
     mCurRasterState         = rasterState;
     mRasterizerStateIsDirty = false;
+
+    return error;
+}
+
+void StateManager11::setScissorRectangle(const gl::Rectangle &scissor, bool enabled)
+{
+    if (!mScissorStateIsDirty)
+        return;
+
+    if (enabled)
+    {
+        D3D11_RECT rect;
+        rect.left   = std::max(0, scissor.x);
+        rect.top    = std::max(0, scissor.y);
+        rect.right  = scissor.x + std::max(0, scissor.width);
+        rect.bottom = scissor.y + std::max(0, scissor.height);
+
+        mDeviceContext->RSSetScissorRects(1, &rect);
     }
 
-    return gl::Error(GL_NO_ERROR);
+    mCurScissorRect      = scissor;
+    mCurScissorEnabled   = enabled;
+    mScissorStateIsDirty = false;
 }
 
 }  // namespace rx

src/libANGLE/renderer/d3d/d3d11/StateManager11.h

@@ -38,11 +38,12 @@ class StateManager11 final : angle::NonCopyable
 
     gl::Error setRasterizerState(const gl::RasterizerState &rasterState);
 
+    void setScissorRectangle(const gl::Rectangle &scissor, bool enabled);
+
     void forceSetBlendState() { mBlendStateIsDirty = true; }
     void forceSetDepthStencilState() { mDepthStencilStateIsDirty = true; }
     void forceSetRasterState() { mRasterizerStateIsDirty = true; }
-
-    void setCurScissorEnabled(bool enabled) { mCurScissorEnabled = enabled; }
+    void forceSetScissorState() { mScissorStateIsDirty = true; }
 
     void updateStencilSizeIfChanged(bool depthStencilInitialized, unsigned int stencilSize);
 
@@ -68,7 +69,10 @@ class StateManager11 final : angle::NonCopyable
     bool mRasterizerStateIsDirty;
     gl::RasterizerState mCurRasterState;
 
+    // Currently applied scissor rectangle state
+    bool mScissorStateIsDirty;
     bool mCurScissorEnabled;
+    gl::Rectangle mCurScissorRect;
 
     ID3D11DeviceContext *mDeviceContext;
     RenderStateCache *mStateCache;