Stop calling flushGLState in onStencilPath

src/gpu/gl/GrGpuGL.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrGpuGL.h"
 #include "GrGLStencilBuffer.h"
@@ skipping 1327 matching lines @@
             }
             return;
         }
     }
 
     // See fall through note above
     this->disableScissor();
 }
 
 bool GrGLGpu::flushGLState(const GrOptDrawState& optState) {
-    // GrGpu::setupClipAndFlushState should have already checked this and bailed if not true.
-    SkASSERT(optState.getRenderTarget());
+    SkASSERT(kStencilPath_DrawType != optState.drawType());
+    this->flushMiscFixedFunctionState(optState);
 
-    if (kStencilPath_DrawType == optState.drawType()) {
-        const GrRenderTarget* rt = optState.getRenderTarget();
-        SkISize size;
-        size.set(rt->width(), rt->height());
-        this->glPathRendering()->setProjectionMatrix(optState.getViewMatrix(), size, rt->origin());
-    } else {
-        this->flushMiscFixedFunctionState(optState);
+    fCurrentProgram.reset(fProgramCache->getProgram(optState));
+    if (NULL == fCurrentProgram.get()) {
+        SkDEBUGFAIL("Failed to create program!");
+        return false;
+    }
 
-        fCurrentProgram.reset(fProgramCache->getProgram(optState));
-        if (NULL == fCurrentProgram.get()) {
-            SkDEBUGFAIL("Failed to create program!");
-            return false;
-        }
+    fCurrentProgram.get()->ref();
 
-        fCurrentProgram.get()->ref();
+    GrGLuint programID = fCurrentProgram->programID();
+    if (fHWProgramID != programID) {
+        GL_CALL(UseProgram(programID));
+        fHWProgramID = programID;
+    }
 
-        GrGLuint programID = fCurrentProgram->programID();
-        if (fHWProgramID != programID) {
-            GL_CALL(UseProgram(programID));
-            fHWProgramID = programID;
-        }
+    this->flushBlend(optState);
 
-        this->flushBlend(optState);
-
-        fCurrentProgram->setData(optState);
-    }
+    fCurrentProgram->setData(optState);
 
     GrGLRenderTarget* glRT = static_cast<GrGLRenderTarget*>(optState.getRenderTarget());
     this->flushStencil(optState.getStencil(), optState.drawType());
     this->flushScissor(optState.getScissorState(), glRT->getViewport(), glRT->origin());
     this->flushAAState(optState);
 
     // This must come after textures are flushed because a texture may need
     // to be msaa-resolved (which will modify bound FBO state).
     this->flushRenderTarget(glRT, NULL);
 
@@ skipping 480 matching lines @@
         SwapBuf();
         int set_a_break_pt_here = 9;
         SwapBuf();
     #endif
 #endif
 }
 
 void GrGLGpu::onStencilPath(const GrOptDrawState& ds,
                             const GrPath* path,
                             const GrStencilSettings& stencil) {
-    if (!this->flushGLState(ds)) {
-        return;
-    }
+    this->flushMiscFixedFunctionState(ds);
+    GrGLRenderTarget* rt = static_cast<GrGLRenderTarget*>(ds.getRenderTarget());
+    SkISize size = SkISize::Make(rt->width(), rt->height());
+    this->glPathRendering()->setProjectionMatrix(ds.getViewMatrix(), size, rt->origin());
+    this->flushStencil(ds.getStencil(), ds.drawType());
+    this->flushScissor(ds.getScissorState(), rt->getViewport(), rt->origin());
+    this->flushAAState(ds);
+    this->flushRenderTarget(rt, NULL);
+
     fPathRendering->stencilPath(path, stencil);
 }
 
 void GrGLGpu::onDrawPath(const GrOptDrawState& ds, const GrPath* path,
                          const GrStencilSettings& stencil) {
     if (!this->flushGLState(ds)) {
         return;
     }
     fPathRendering->drawPath(path, stencil);
 }
@@ skipping 841 matching lines @@
             this->setVertexArrayID(gpu, 0);
         }
         int attrCount = gpu->glCaps().maxVertexAttributes();
         if (fDefaultVertexArrayAttribState.count() != attrCount) {
             fDefaultVertexArrayAttribState.resize(attrCount);
         }
         attribState = &fDefaultVertexArrayAttribState;
     }
     return attribState;
 }