Revert of move program descriptor generation to flush

src/gpu/GrGpu.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrGpu.h"
@@ skipping 259 matching lines @@
                                                           4);
     }
 
     return fQuadIndexBuffer;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 void GrGpu::draw(const GrOptDrawState& ds, const GrDrawTarget::DrawInfo& info) {
     this->handleDirtyContext();
-    if (!this->flushGraphicsState(ds)) {
+    if (!this->flushGraphicsState(ds, PrimTypeToDrawType(info.primitiveType()))) {
         return;
     }
     this->onDraw(ds, info);
 }
 
 void GrGpu::stencilPath(const GrOptDrawState& ds,
                         const GrPath* path,
                         const GrStencilSettings& stencilSettings) {
     this->handleDirtyContext();
 
-    if (!this->flushGraphicsState(ds)) {
+    if (!this->flushGraphicsState(ds, kStencilPath_DrawType)) {
         return;
     }
 
     this->pathRendering()->stencilPath(path, stencilSettings);
 }
 
 
 void GrGpu::drawPath(const GrOptDrawState& ds,
                      const GrPath* path,
                      const GrStencilSettings& stencilSettings) {
     this->handleDirtyContext();
 
-    if (!this->flushGraphicsState(ds)) {
+    if (!this->flushGraphicsState(ds, kDrawPath_DrawType)) {
         return;
     }
 
     this->pathRendering()->drawPath(path, stencilSettings);
 }
 
 void GrGpu::drawPaths(const GrOptDrawState& ds,
                       const GrPathRange* pathRange,
                       const void* indices,
                       GrDrawTarget::PathIndexType indexType,
                       const float transformValues[],
                       GrDrawTarget::PathTransformType transformType,
                       int count,
                       const GrStencilSettings& stencilSettings) {
     this->handleDirtyContext();
 
-    if (!this->flushGraphicsState(ds)) {
+    if (!this->flushGraphicsState(ds, kDrawPaths_DrawType)) {
         return;
     }
 
     pathRange->willDrawPaths(indices, indexType, count);
     this->pathRendering()->drawPaths(pathRange, indices, indexType, transformValues,
                                      transformType, count, stencilSettings);
 }