Initial CL to move color / coverage off of drawstate

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 163 matching lines @@
         // finally add the stage to the correct pipeline in the drawstate
         if (s < numColorProcs) {
             ds->addColorProcessor(fp);
         } else {
             ds->addCoverageProcessor(fp);
         }
         ++s;
     }
 }
 
-// There are only a few cases of random colors which interest us
-enum ColorMode {
-    kAllOnes_ColorMode,
-    kAllZeros_ColorMode,
-    kAlphaOne_ColorMode,
-    kRandom_ColorMode,
-    kLast_ColorMode = kRandom_ColorMode
-};
-
-static void set_random_color(GrDrawState* ds, SkRandom* random) {
-    ColorMode colorMode = ColorMode(random->nextULessThan(kLast_ColorMode + 1));
-    GrColor color;
-    switch (colorMode) {
-        case kAllOnes_ColorMode:
-            color = GrColorPackRGBA(0xFF, 0xFF, 0xFF, 0xFF);
-            break;
-        case kAllZeros_ColorMode:
-            color = GrColorPackRGBA(0, 0, 0, 0);
-            break;
-        case kAlphaOne_ColorMode:
-            color = GrColorPackRGBA(random->nextULessThan(256),
-                                    random->nextULessThan(256),
-                                    random->nextULessThan(256),
-                                    0xFF);
-            break;
-        case kRandom_ColorMode:
-            uint8_t alpha = random->nextULessThan(256);
-            color = GrColorPackRGBA(random->nextRangeU(0, alpha),
-                                    random->nextRangeU(0, alpha),
-                                    random->nextRangeU(0, alpha),
-                                    alpha);
-            break;
-    }
-    GrColorIsPMAssert(color);
-    ds->setColor(color);
-}
-
-// There are only a few cases of random coverages which interest us
-enum CoverageMode {
-    kZero_CoverageMode,
-    kFF_CoverageMode,
-    kRandom_CoverageMode,
-    kLast_CoverageMode = kRandom_CoverageMode
-};
-
-static void set_random_coverage(GrDrawState* ds, SkRandom* random) {
-    CoverageMode coverageMode = CoverageMode(random->nextULessThan(kLast_CoverageMode + 1));
-    uint8_t coverage;
-    switch (coverageMode) {
-        case kZero_CoverageMode:
-            coverage = 0;
-            break;
-        case kFF_CoverageMode:
-            coverage = 0xFF;
-            break;
-        case kRandom_CoverageMode:
-            coverage = uint8_t(random->nextU());
-            break;
-    }
-    ds->setCoverage(coverage);
-}
-
 static void set_random_hints(GrDrawState* ds, SkRandom* random) {
     for (int i = 1; i <= GrDrawState::kLast_Hint; i <<= 1) {
         ds->setHint(GrDrawState::Hints(i), random->nextBool());
     }
 }
 
 static void set_random_state(GrDrawState* ds, SkRandom* random) {
     int state = 0;
     for (int i = 1; i <= GrDrawState::kLast_StateBit; i <<= 1) {
         state |= random->nextBool() * i;
@@ skipping 109 matching lines @@
         bool hasGeometryProcessor = !usePathRendering;
         if (hasGeometryProcessor) {
             set_random_gp(fContext, gpu->glCaps(), &ds, &random, dummyTextures);
         }
         set_random_color_coverage_stages(gpu,
                                          &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);
 
         GrDeviceCoordTexture dstCopy;
 
-        if (!this->setupDstReadIfNecessary(&ds, &dstCopy, NULL)) {
+        // TODO take color off the PP when its installed
+        GrColor color = ds.hasGeometryProcessor() ? ds.getGeometryProcessor()->getColor() :
+                                                    GrColor_WHITE;
+        uint8_t coverage = ds.hasGeometryProcessor() ? ds.getGeometryProcessor()->getCoverage() :
+                                                       0xff;
+        if (!this->setupDstReadIfNecessary(&ds, color, coverage, &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
-        GrOptDrawState ods(ds, *gpu->caps(), scissor, &dstCopy, drawType);
+        GrOptDrawState ods(ds, color, coverage, *gpu->caps(), scissor, &dstCopy, drawType);
         if (ods.mustSkip()) {
             continue;
         }
         ods.finalize(gpu);
         SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(ods, gpu));
         if (NULL == program.get()) {
             SkDebugf("Failed to create program!");
             return false;
         }
 
@@ skipping 32 matching lines @@
             }
 #endif
             GrTestTarget target;
             context->getTestTarget(&target);
             REPORTER_ASSERT(reporter, target.target()->programUnitTest(maxStages));
         }
     }
 }
 
 #endif