OptState owns program descriptor

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 429 matching lines @@
         }
         set_random_color_coverage_stages(this, maxStages - hasGeometryProcessor, usePathRendering,
                                          &random, dummyTextures);
         set_random_color(this, &random);
         set_random_coverage(this, &random);
         set_random_hints(this, &random);
         set_random_state(this, &random);
         set_random_blend_func(this, &random);
         set_random_stencil(this, &random);
 
-        // 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(),
-                                                                *this->caps(),
-                                                                drawType));
-        if (!ods.get()) {
-            ds->reset();
-            continue;
-        }
-        GrGLProgramDesc desc;
         GrDeviceCoordTexture dstCopy;
 
         if (!this->setupDstReadIfNecessary(&dstCopy, NULL)) {
             SkDebugf("Couldn't setup dst read texture");
             return false;
         }
-        if (!GrGLProgramDesc::Build(*ods,
-                                    drawType,
-                                    this,
-                                    dstCopy.texture() ? &dstCopy : NULL,
-                                    &desc)) {
-            SkDebugf("Failed to generate GL program descriptor");
-            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(),
+                                                                this,
+                                                                &dstCopy,
+                                                                drawType));
+        if (!ods.get()) {
+            ds->reset();
+            continue;
         }
-        SkAutoTUnref<GrGLProgram> program(
-                GrGLProgramBuilder::CreateProgram(*ods, desc, drawType, this));
+        SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(*ods, drawType, this));
         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
@@ skipping 28 matching lines @@
             if (type == GrContextFactory::kANGLE_GLContextType) {
                 maxStages = 3;
             }
 #endif
             REPORTER_ASSERT(reporter, gpu->programUnitTest(maxStages));
         }
     }
 }
 
 #endif