Reordered the logic of Renderer11::clear to determine earlier if a masked clear is required.

src/libGLESv2/renderer/Renderer11.cpp

@@ -1200,6 +1200,31 @@ void Renderer11::applyUniforms(const gl::UniformArray *uniformArray)
 
 void Renderer11::clear(const gl::ClearParameters &clearParams, gl::Framebuffer *frameBuffer)
 {
+     bool alphaUnmasked = (gl::GetAlphaSize(mRenderTargetDesc.format) == 0) || clearParams.colorMaskAlpha;
+     bool needMaskedColorClear = (clearParams.mask & GL_COLOR_BUFFER_BIT) &&
+                                 !(clearParams.colorMaskRed && clearParams.colorMaskGreen &&
+                                   clearParams.colorMaskBlue && alphaUnmasked);
+
+     unsigned int stencilUnmasked = 0x0;
+     if (frameBuffer->hasStencil())
+     {
+         unsigned int stencilSize = gl::GetStencilSize(frameBuffer->getStencilbuffer()->getActualFormat());
+         stencilUnmasked = (0x1 << stencilSize) - 1;
+     }
+     bool needMaskedStencilClear = (clearParams.mask & GL_STENCIL_BUFFER_BIT) &&
+                                   (clearParams.stencilWriteMask & stencilUnmasked) != stencilUnmasked;
+
+     bool needScissoredClear = mScissorEnabled && (mCurScissor.x > 0 || mCurScissor.y > 0 ||
+                                                   mCurScissor.x + mCurScissor.width < mRenderTargetDesc.width ||
+                                                   mCurScissor.y + mCurScissor.height < mRenderTargetDesc.height);
+
+     if (needMaskedColorClear || needMaskedStencilClear || needScissoredClear)
+     {
+         // TODO
+         UNIMPLEMENTED();
+     }
+     else
+     {
          if (clearParams.mask & GL_COLOR_BUFFER_BIT)
          {
              gl::Renderbuffer *renderbufferObject = frameBuffer->getColorbuffer();
@@ -1219,32 +1244,11 @@ void Renderer11::clear(const gl::ClearParameters &clearParams, gl::Framebuffer *
                     return;
                 }
 
-            if (mScissorEnabled && (mCurScissor.x > 0 || mCurScissor.y > 0 ||
-                                    mCurScissor.x + mCurScissor.width < renderTarget->getWidth() ||
-                                    mCurScissor.y + mCurScissor.height < renderTarget->getHeight()))
-            {
-                // TODO: clearing of subregion of render target
-                UNIMPLEMENTED();
-            }
-
-            bool alphaUnmasked = (gl::GetAlphaSize(mRenderTargetDesc.format) == 0) || clearParams.colorMaskAlpha;
-            const bool needMaskedColorClear = (clearParams.mask & GL_COLOR_BUFFER_BIT) &&
-                                              !(clearParams.colorMaskRed && clearParams.colorMaskGreen &&
-                                               clearParams.colorMaskBlue && alphaUnmasked);
-
-            if (needMaskedColorClear)
-            {
-                // TODO: masked color clearing
-                UNIMPLEMENTED();
-            }
-            else
-            {
                 const float clearValues[4] = { clearParams.colorClearValue.red,
                                                clearParams.colorClearValue.green,
                                                clearParams.colorClearValue.blue,
                                                clearParams.colorClearValue.alpha };
                 mDeviceContext->ClearRenderTargetView(framebufferRTV, clearValues);
-            }
 
                 framebufferRTV->Release();
             }
@@ -1268,31 +1272,6 @@ void Renderer11::clear(const gl::ClearParameters &clearParams, gl::Framebuffer *
                     return;
                 }
 
-            if (mScissorEnabled && (mCurScissor.x > 0 || mCurScissor.y > 0 ||
-                                    mCurScissor.x + mCurScissor.width < renderTarget->getWidth() ||
-                                    mCurScissor.y + mCurScissor.height < renderTarget->getHeight()))
-            {
-                // TODO: clearing of subregion of depth stencil view
-                UNIMPLEMENTED();
-            }
-
-            unsigned int stencilUnmasked = 0x0;
-            if ((clearParams.mask & GL_STENCIL_BUFFER_BIT) && frameBuffer->hasStencil())
-            {
-                unsigned int stencilSize = gl::GetStencilSize(frameBuffer->getStencilbuffer()->getActualFormat());
-                stencilUnmasked = (0x1 << stencilSize) - 1;
-            }
-
-            const bool needMaskedStencilClear = (clearParams.mask & GL_STENCIL_BUFFER_BIT) &&
-                                                (clearParams.stencilWriteMask & stencilUnmasked) != stencilUnmasked;
-
-            if (needMaskedStencilClear)
-            {
-                // TODO: masked clearing of depth stencil
-                UNIMPLEMENTED();
-            }
-            else
-            {
                 UINT clearFlags = 0;
                 if (clearParams.mask & GL_DEPTH_BUFFER_BIT)
                 {
@@ -1307,11 +1286,11 @@ void Renderer11::clear(const gl::ClearParameters &clearParams, gl::Framebuffer *
                 UINT8 stencilClear = clearParams.stencilClearValue & 0x000000FF;
 
                 mDeviceContext->ClearDepthStencilView(framebufferDSV, clearFlags, depthClear, stencilClear);
-            }
 
                 framebufferDSV->Release();
             }
         }
+    }
 }
 
 void Renderer11::markAllStateDirty()