Create GrOptDrawState before recording draw in GrInOrderDrawBuffer

src/gpu/gl/GrGLProgramDesc.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "GrGLProgramDesc.h"
 
 #include "GrGLProcessor.h"
 #include "GrBackendProcessorFactory.h"
@@ skipping 55 matching lines @@
     const GrGeometryProcessor::VertexAttribArray& vars = proc.getVertexAttribs();
     int numAttributes = vars.count();
     SkASSERT(numAttributes <= 2);
     for (int a = 0; a < numAttributes; ++a) {
         uint32_t value = 1 << a;
         key |= value;
     }
     return key;
 }
 
-static uint32_t gen_transform_key(const GrFragmentStage& effectStage,
+static uint32_t gen_transform_key(const GrPendingFragmentStage& stage,
                                   bool useExplicitLocalCoords) {
     uint32_t totalKey = 0;
-    int numTransforms = effectStage.getProcessor()->numTransforms();
+    int numTransforms = stage.getProcessor()->numTransforms();
     for (int t = 0; t < numTransforms; ++t) {
         uint32_t key = 0;
-        if (effectStage.isPerspectiveCoordTransform(t, useExplicitLocalCoords)) {
+        if (stage.isPerspectiveCoordTransform(t)) {
             key |= kGeneral_MatrixType;
         } else {
             key |= kNoPersp_MatrixType;
         }
 
-        const GrCoordTransform& coordTransform = effectStage.getProcessor()->coordTransform(t);
+        const GrCoordTransform& coordTransform = stage.getProcessor()->coordTransform(t);
         if (kLocal_GrCoordSet != coordTransform.sourceCoords() && useExplicitLocalCoords) {
             key |= kPositionCoords_Flag;
         }
         key <<= kTransformKeyBits * t;
         SkASSERT(0 == (totalKey & key)); // keys for each transform ought not to overlap
         totalKey |= key;
     }
     return totalKey;
 }
 
@@ skipping 55 matching lines @@
                                 const GrGLCaps& caps,
                                 bool,
                                 GrProcessorKeyBuilder* b,
                                 uint16_t* keySize) {
         /* 0 because no transforms on a GP */
         return get_meta_key(gp, caps, 0, gen_attrib_key(gp), b, keySize);
     }
 };
 
 struct FragmentProcessorKeyBuilder {
-    typedef GrFragmentStage StagedProcessor;
-    static bool GetProcessorKey(const GrFragmentStage& fps,
+    typedef GrPendingFragmentStage StagedProcessor;
+    static bool GetProcessorKey(const GrPendingFragmentStage& fps,
                                 const GrGLCaps& caps,
                                 bool useLocalCoords,
                                 GrProcessorKeyBuilder* b,
                                 uint16_t* keySize) {
         /* 0 because no attribs on a fP */
         return get_meta_key(*fps.getProcessor(), caps, gen_transform_key(fps, useLocalCoords), 0,
                             b, keySize);
     }
 };
 
@@ skipping 164 matching lines @@
     }
 
     header->fPrimaryOutputType = descInfo.fPrimaryOutputType;
     header->fSecondaryOutputType = descInfo.fSecondaryOutputType;
 
     header->fColorEffectCnt = optState.numColorStages();
     header->fCoverageEffectCnt = optState.numCoverageStages();
     desc->finalize();
     return true;
 }