Drawstate on stack

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 410 matching lines @@
     SkRandom random;
     static const int NUM_TESTS = 512;
     for (int t = 0; t < NUM_TESTS;) {
         // setup random render target(can fail)
         SkAutoTUnref<GrRenderTarget> rt(random_render_target(fContext, glProgramsCacheID, &random));
         if (!rt.get()) {
             SkDebugf("Could not allocate render target");
             return false;
         }
 
-        GrDrawState* ds = this->drawState();
-        ds->setRenderTarget(rt.get());
+        GrDrawState ds;
+        ds.setRenderTarget(rt.get());
 
         // if path rendering we have to setup a couple of things like the draw type
         bool usePathRendering = gpu->glCaps().pathRenderingSupport() && random.nextBool();
 
         GrGpu::DrawType drawType = usePathRendering ? GrGpu::kDrawPath_DrawType :
                                                       GrGpu::kDrawPoints_DrawType;
 
         // twiddle drawstate knobs randomly
         bool hasGeometryProcessor = !usePathRendering;
         if (hasGeometryProcessor) {
-            set_random_gp(fContext, gpu->glCaps(), ds, &random, dummyTextures);
+            set_random_gp(fContext, gpu->glCaps(), &ds, &random, dummyTextures);
         }
         set_random_color_coverage_stages(gpu,
-                                         ds,
+                                         &ds,
                                          maxStages - hasGeometryProcessor,
                                          usePathRendering,
                                          &random,
                                          dummyTextures);
-        set_random_color(ds, &random);
-        set_random_coverage(ds, &random);
-        set_random_hints(ds, &random);
-        set_random_state(ds, &random);
-        set_random_blend_func(ds, &random);
-        set_random_stencil(ds, &random);
+        set_random_color(&ds, &random);
+        set_random_coverage(&ds, &random);
+        set_random_hints(&ds, &random);
+        set_random_state(&ds, &random);
+        set_random_blend_func(&ds, &random);
+        set_random_stencil(&ds, &random);
 
         GrDeviceCoordTexture dstCopy;
 
-        if (!this->setupDstReadIfNecessary(&dstCopy, NULL)) {
+        if (!this->setupDstReadIfNecessary(&ds, &dstCopy, NULL)) {
             SkDebugf("Couldn't setup dst read texture");
             return false;
         }
 
         // create optimized draw state, setup readDst texture if required, and build a descriptor
         // and program.  ODS creation can fail, so we have to check
-        SkAutoTUnref<GrOptDrawState> ods(GrOptDrawState::Create(this->getDrawState(),
-                                                                gpu,
+        SkAutoTUnref<GrOptDrawState> ods(GrOptDrawState::Create(gpu,
+                                                                ds,
                                                                 &dstCopy,
                                                                 drawType));
         if (!ods.get()) {
-            ds->reset();
             continue;
         }
         SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(*ods, drawType, gpu));
         if (NULL == program.get()) {
             SkDebugf("Failed to create program!");
             return false;
         }
 
-        // We have to reset the drawstate because we might have added a gp
-        ds->reset();
-
         // because occasionally optimized drawstate creation will fail for valid reasons, we only
         // want to increment on success
         ++t;
     }
     return true;
 }
 
 DEF_GPUTEST(GLPrograms, reporter, factory) {
     for (int type = 0; type < GrContextFactory::kLastGLContextType; ++type) {
         GrContext* context = factory->get(static_cast<GrContextFactory::GLContextType>(type));
@@ skipping 22 matching lines @@
             }
 #endif
             GrTestTarget target;
             context->getTestTarget(&target);
             REPORTER_ASSERT(reporter, target.target()->programUnitTest(maxStages));
         }
     }
 }
 
 #endif