Remove GrGpu::flushGraphicsState

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 1326 matching lines @@
                 fHWScissorSettings.fEnabled = kYes_TriState;
             }
             return;
         }
     }
 
     // See fall through note above
     this->disableScissor();
 }
 
-bool GrGLGpu::flushGraphicsState(const GrOptDrawState& optState) {
+bool GrGLGpu::flushGLState(const GrOptDrawState& optState) {
     // GrGpu::setupClipAndFlushState should have already checked this and bailed if not true.
     SkASSERT(optState.getRenderTarget());
 
     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);
@@ skipping 469 matching lines @@
                 if(wndProcID == procID) {
                     SwapBuffers(GetDC(hwnd));
                 }
                 hwnd = GetNextWindow(hwnd, GW_HWNDNEXT);
             }
          }
     #endif
 #endif
 
 void GrGLGpu::onDraw(const GrOptDrawState& ds, const GrDrawTarget::DrawInfo& info) {
+    if (!this->flushGLState(ds)) {
+        return;
+    }
+
     size_t indexOffsetInBytes;
     this->setupGeometry(ds, info, &indexOffsetInBytes);
 
     SkASSERT((size_t)info.primitiveType() < SK_ARRAY_COUNT(gPrimitiveType2GLMode));
 
     if (info.isIndexed()) {
         GrGLvoid* indices =
             reinterpret_cast<GrGLvoid*>(indexOffsetInBytes + sizeof(uint16_t) * info.startIndex());
         // info.startVertex() was accounted for by setupGeometry.
         GL_CALL(DrawElements(gPrimitiveType2GLMode[info.primitiveType()],
@@ skipping 13 matching lines @@
         int set_a_break_pt_here = 9;
         aglSwapBuffers(aglGetCurrentContext());
     #elif defined(SK_BUILD_FOR_WIN32)
         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;
+    }
+    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);
+}
+
+void GrGLGpu::onDrawPaths(const GrOptDrawState& ds,
+                          const GrPathRange* pathRange,
+                          const void* indices,
+                          GrDrawTarget::PathIndexType indexType,
+                          const float transformValues[],
+                          GrDrawTarget::PathTransformType transformType,
+                           int count,
+                           const GrStencilSettings& stencil) {
+    if (!this->flushGLState(ds)) {
+        return;
+    }
+    fPathRendering->drawPaths(pathRange, indices, indexType, transformValues,
+                              transformType, count, stencil);
+}
+
 void GrGLGpu::onResolveRenderTarget(GrRenderTarget* target) {
     GrGLRenderTarget* rt = static_cast<GrGLRenderTarget*>(target);
     if (rt->needsResolve()) {
         // Some extensions automatically resolves the texture when it is read.
         if (this->glCaps().usesMSAARenderBuffers()) {
             SkASSERT(rt->textureFBOID() != rt->renderFBOID());
             fGPUStats.incRenderTargetBinds();
             fGPUStats.incRenderTargetBinds();
             GL_CALL(BindFramebuffer(GR_GL_READ_FRAMEBUFFER, rt->renderFBOID()));
             GL_CALL(BindFramebuffer(GR_GL_DRAW_FRAMEBUFFER, rt->textureFBOID()));
@@ skipping 815 matching lines @@
             this->setVertexArrayID(gpu, 0);
         }
         int attrCount = gpu->glCaps().maxVertexAttributes();
         if (fDefaultVertexArrayAttribState.count() != attrCount) {
             fDefaultVertexArrayAttribState.resize(attrCount);
         }
         attribState = &fDefaultVertexArrayAttribState;
     }
     return attribState;
 }