Create GrOptDrawState before recording draw in GrInOrderDrawBuffer

tests/GLProgramsTest.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.
  */
 
 // This is a GPU-backend specific test. It relies on static intializers to work
 
@@ skipping 154 matching lines @@
         kGenericVertexAttribs[*attribIndex].fBinding = binding;
         *runningStride += GrVertexAttribTypeSize(kGenericVertexAttribs[(*attribIndex)++].fType);
     }
 }
 
 static void set_random_gp(GrContext* context,
                           const GrDrawTargetCaps& caps,
                           GrDrawState* ds,
                           SkRandom* random,
                           GrTexture* dummyTextures[]) {
-    GrProgramElementRef<const GrGeometryProcessor> gp(
+    SkAutoTUnref<const GrGeometryProcessor> gp(
             GrProcessorTestFactory<GrGeometryProcessor>::CreateStage(random,
                                                                      context,
                                                                      caps,
                                                                      dummyTextures));
     SkASSERT(gp);
 
     // we have to set dummy vertex attributes, first we setup the fixed function attributes
     // always leave the position attribute untouched in the array
     int attribIndex = 1;
     int runningStride = GrVertexAttribTypeSize(kGenericVertexAttribs[0].fType);
@@ skipping 35 matching lines @@
                                              GrDrawState* ds,
                                              int maxStages,
                                              bool usePathRendering,
                                              SkRandom* random,
                                              GrTexture* dummyTextures[]) {
     int numProcs = random->nextULessThan(maxStages + 1);
     int numColorProcs = random->nextULessThan(numProcs + 1);
 
     int currTextureCoordSet = 0;
     for (int s = 0; s < numProcs;) {
-        GrProgramElementRef<GrFragmentProcessor> fp(
+        SkAutoTUnref<const GrFragmentProcessor> fp(
                 GrProcessorTestFactory<GrFragmentProcessor>::CreateStage(random,
                                                                          gpu->getContext(),
                                                                          *gpu->caps(),
                                                                          dummyTextures));
         SkASSERT(fp);
 
         // don't add dst color reads to coverage stage
         if (s >= numColorProcs && fp->willReadDstColor()) {
             continue;
         }
@@ skipping 271 matching lines @@
             }
 #endif
             GrTestTarget target;
             context->getTestTarget(&target);
             REPORTER_ASSERT(reporter, target.target()->programUnitTest(maxStages));
         }
     }
 }
 
 #endif