Draft change to start pulling uniform color into GP

src/gpu/GrOptDrawState.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrOptDrawState.h"
 
 #include "GrDrawState.h"
@@ skipping 130 matching lines @@
         SkNEW_APPEND_TO_TARRAY(&fFragmentStages,
                                GrPendingFragmentStage,
                                (drawState.fCoverageStages[i], hasLocalCoords));
     }
 
     // let the GP init the batch tracker
     if (gp) {
         GrGeometryProcessor::InitBT init;
         init.fOutputColor = fDescInfo.fInputColorIsUsed;
         init.fOutputCoverage = fDescInfo.fInputCoverageIsUsed;
+        init.fRemoveColorAttr = !fDescInfo.fHasVertexColor;
+        init.fRemoveCoverageAttr = !fDescInfo.fHasVertexCoverage;
         init.fColor = this->getColor();
-        init.fCoverage = this->getCoverage();
+        init.fCoverage = this->getCoverageColor();
         fGeometryProcessor->initBatchTracker(&fBatchTracker, init);
     }
 }
 
 void GrOptDrawState::adjustProgramFromOptimizations(const GrDrawState& ds,
                                                     GrXferProcessor::OptFlags flags,
                                                     const GrProcOptInfo& colorPOI,
                                                     const GrProcOptInfo& coveragePOI,
                                                     int* firstColorStageIdx,
                                                     int* firstCoverageStageIdx) {
@@ skipping 57 matching lines @@
 
     if (!fDescInfo.fHasVertexCoverage && this->fCoverage != that.fCoverage) {
         return false;
     }
 
     if (this->hasGeometryProcessor()) {
         if (!that.hasGeometryProcessor()) {
             return false;
         } else if (!this->getGeometryProcessor()->isEqual(*that.getGeometryProcessor())) {
             return false;
+        } else if (this->getGeometryProcessor()->fNewStyle) {
+            if (!this->getGeometryProcessor()->canBatch(this->getBatchTracker(),
+                                                        that.getBatchTracker())) {
+                return false;
+            }
         }
     } else if (that.hasGeometryProcessor()) {
         return false;
     }
 
     if (!this->getXferProcessor()->isEqual(*that.getXferProcessor())) {
         return false;
     }
 
     // The program desc comparison should have already assured that the stage counts match.
     SkASSERT(this->numFragmentStages() == that.numFragmentStages());
     for (int i = 0; i < this->numFragmentStages(); i++) {
 
         if (this->getFragmentStage(i) != that.getFragmentStage(i)) {
             return false;
         }
     }
+
     return true;
 }