Refactored Renderer::setScissor to no longer require render target size.

src/libGLESv2/Context.cpp

@@ -1761,8 +1761,7 @@ bool Context::applyRenderTarget(bool ignoreViewport)
     }
     mDxUniformsDirty = false;
 
-    mRenderer->setScissorRectangle(mState.scissor, static_cast<int>(mRenderTargetDesc.width),
-                                    static_cast<int>(mRenderTargetDesc.height));
+    mRenderer->setScissorRectangle(mState.scissor);
 
     return true;
 }

src/libGLESv2/renderer/Renderer.h

@@ -87,8 +87,7 @@ class Renderer
     virtual void setDepthStencilState(const gl::DepthStencilState &depthStencilState, int stencilRef,
                                       int stencilBackRef, bool frontFaceCCW, unsigned int stencilSize) = 0;
 
-    virtual void setScissorRectangle(const gl::Rectangle& scissor, unsigned int renderTargetWidth,
-                                     unsigned int renderTargetHeight) = 0;
+    virtual void setScissorRectangle(const gl::Rectangle &scissor) = 0;
     virtual bool setViewport(const gl::Rectangle& viewport, float zNear, float zFar,
                              unsigned int renderTargetWidth, unsigned int renderTargetHeight,
                              gl::ProgramBinary *currentProgram, bool forceSetUniforms) = 0;

src/libGLESv2/renderer/Renderer11.cpp

@@ -350,25 +350,19 @@ void Renderer11::setDepthStencilState(const gl::DepthStencilState &depthStencilS
     mForceSetDepthStencilState = false;
 }
 
-void Renderer11::setScissorRectangle(const gl::Rectangle& scissor, unsigned int renderTargetWidth,
-                                     unsigned int renderTargetHeight)
+void Renderer11::setScissorRectangle(const gl::Rectangle &scissor)
 {
-    if (mForceSetScissor ||
-        renderTargetWidth != mCurRenderTargetWidth ||
-        renderTargetHeight != mCurRenderTargetHeight ||
-        memcmp(&scissor, &mCurScissor, sizeof(gl::Rectangle)) != 0)
+    if (mForceSetScissor || memcmp(&scissor, &mCurScissor, sizeof(gl::Rectangle)) != 0)
     {
         D3D11_RECT rect;
-        rect.left = gl::clamp(scissor.x, 0, static_cast<int>(renderTargetWidth));
-        rect.top = gl::clamp(scissor.y, 0, static_cast<int>(renderTargetHeight));
-        rect.right = gl::clamp(scissor.x + scissor.width, 0, static_cast<int>(renderTargetWidth));
-        rect.bottom = gl::clamp(scissor.y + scissor.height, 0, static_cast<int>(renderTargetHeight));
+        rect.left = gl::clamp(scissor.x, 0, static_cast<int>(mRenderTargetDesc.width));
+        rect.top = gl::clamp(scissor.y, 0, static_cast<int>(mRenderTargetDesc.height));
+        rect.right = gl::clamp(scissor.x + scissor.width, 0, static_cast<int>(mRenderTargetDesc.width));
+        rect.bottom = gl::clamp(scissor.y + scissor.height, 0, static_cast<int>(mRenderTargetDesc.height));
 
         mDeviceContext->RSSetScissorRects(1, &rect);
 
         mCurScissor = scissor;
-        mCurRenderTargetWidth = renderTargetWidth;
-        mCurRenderTargetHeight = renderTargetHeight;
     }
 
     mForceSetScissor = false;

src/libGLESv2/renderer/Renderer11.h

@@ -54,8 +54,7 @@ class Renderer11 : public Renderer
     virtual void setDepthStencilState(const gl::DepthStencilState &depthStencilState, int stencilRef,
                                       int stencilBackRef, bool frontFaceCCW, unsigned int stencilSize);
 
-    virtual void setScissorRectangle(const gl::Rectangle& scissor, unsigned int renderTargetWidth,
-                                     unsigned int renderTargetHeight);
+    virtual void setScissorRectangle(const gl::Rectangle &scissor);
     virtual bool setViewport(const gl::Rectangle& viewport, float zNear, float zFar,
                              unsigned int renderTargetWidth, unsigned int renderTargetHeight,
                              gl::ProgramBinary *currentProgram, bool forceSetUniforms);
@@ -177,8 +176,6 @@ class Renderer11 : public Renderer
     // Currently applied scissor rectangle
     bool mForceSetScissor;
     gl::Rectangle mCurScissor;
-    unsigned int mCurRenderTargetWidth;
-    unsigned int mCurRenderTargetHeight;
 
     // Currently applied viewport
     bool mForceSetViewport;

src/libGLESv2/renderer/Renderer9.cpp

@@ -900,26 +900,20 @@ void Renderer9::setDepthStencilState(const gl::DepthStencilState &depthStencilSt
     mForceSetDepthStencilState = false;
 }
 
-void Renderer9::setScissorRectangle(const gl::Rectangle& scissor, unsigned int renderTargetWidth,
-                                    unsigned int renderTargetHeight)
+void Renderer9::setScissorRectangle(const gl::Rectangle &scissor)
 {
-    bool renderTargetSizedChanged = mForceSetScissor ||
-                                    renderTargetWidth != mCurRenderTargetWidth ||
-                                    renderTargetHeight != mCurRenderTargetHeight;
     bool scissorChanged = mForceSetScissor || memcmp(&scissor, &mCurScissor, sizeof(gl::Rectangle)) != 0;
 
-    if (renderTargetSizedChanged || scissorChanged)
+    if (scissorChanged)
     {
         RECT rect;
-        rect.left = gl::clamp(scissor.x, 0, static_cast<int>(renderTargetWidth));
-        rect.top = gl::clamp(scissor.y, 0, static_cast<int>(renderTargetHeight));
-        rect.right = gl::clamp(scissor.x + scissor.width, 0, static_cast<int>(renderTargetWidth));
-        rect.bottom = gl::clamp(scissor.y + scissor.height, 0, static_cast<int>(renderTargetHeight));
+        rect.left = gl::clamp(scissor.x, 0, static_cast<int>(mRenderTargetDesc.width));
+        rect.top = gl::clamp(scissor.y, 0, static_cast<int>(mRenderTargetDesc.height));
+        rect.right = gl::clamp(scissor.x + scissor.width, 0, static_cast<int>(mRenderTargetDesc.width));
+        rect.bottom = gl::clamp(scissor.y + scissor.height, 0, static_cast<int>(mRenderTargetDesc.height));
         mDevice->SetScissorRect(&rect);
 
         mCurScissor = scissor;
-        mCurRenderTargetWidth = renderTargetWidth;
-        mCurRenderTargetHeight = renderTargetHeight;
     }
 
     mForceSetScissor = false;

src/libGLESv2/renderer/Renderer9.h

@@ -89,8 +89,7 @@ class Renderer9 : public Renderer
     virtual void setDepthStencilState(const gl::DepthStencilState &depthStencilState, int stencilRef,
                                       int stencilBackRef, bool frontFaceCCW, unsigned int stencilSize);
 
-    virtual void setScissorRectangle(const gl::Rectangle& scissor, unsigned int renderTargetWidth,
-                                     unsigned int renderTargetHeight);
+    virtual void setScissorRectangle(const gl::Rectangle &scissor);
     virtual bool setViewport(const gl::Rectangle& viewport, float zNear, float zFar,
                              unsigned int renderTargetWidth, unsigned int renderTargetHeight,
                              gl::ProgramBinary *currentProgram, bool forceSetUniforms);