Draft change to start pulling uniform color into GP

src/gpu/gl/GrGLProgramDesc.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "GrGLProgramDesc.h"
 
 #include "GrGLProcessor.h"
 #include "GrProcessor.h"
@@ skipping 185 matching lines @@
     header->fHasGeometryProcessor = optState.hasGeometryProcessor();
 
     bool isPathRendering = GrGpu::IsPathRenderingDrawType(drawType);
     if (gpu->caps()->pathRenderingSupport() && isPathRendering) {
         header->fUseNvpr = true;
         SkASSERT(!optState.hasGeometryProcessor());
     } else {
         header->fUseNvpr = false;
     }
 
-    bool hasUniformColor = inputColorIsUsed && (isPathRendering || !descInfo.fHasVertexColor);
+    if (!optState.newStyle()) {
+        bool hasUniformColor = inputColorIsUsed && (isPathRendering || !descInfo.fHasVertexColor);
 
-    if (!inputColorIsUsed) {
-        header->fColorInput = GrProgramDesc::kAllOnes_ColorInput;
-    } else if (hasUniformColor) {
-        header->fColorInput = GrProgramDesc::kUniform_ColorInput;
+        if (!inputColorIsUsed) {
+            header->fColorInput = GrProgramDesc::kAllOnes_ColorInput;
+        } else if (hasUniformColor) {
+            header->fColorInput = GrProgramDesc::kUniform_ColorInput;
+        } else {
+            header->fColorInput = GrProgramDesc::kAttribute_ColorInput;
+            SkASSERT(!header->fUseNvpr);
+        }
+
+        bool hasVertexCoverage = !isPathRendering && descInfo.fHasVertexCoverage;
+
+        bool covIsSolidWhite = !hasVertexCoverage && 0xffffffff == optState.getCoverageColor();
+
+        if (covIsSolidWhite || !inputCoverageIsUsed) {
+            header->fCoverageInput = GrProgramDesc::kAllOnes_ColorInput;
+        } else if (!hasVertexCoverage) {
+            header->fCoverageInput = GrProgramDesc::kUniform_ColorInput;
+        } else {
+            header->fCoverageInput = GrProgramDesc::kAttribute_ColorInput;
+            SkASSERT(!header->fUseNvpr);
+        }
     } else {
         header->fColorInput = GrProgramDesc::kAttribute_ColorInput;
-        SkASSERT(!header->fUseNvpr);
-    }
-
-    bool hasVertexCoverage = !isPathRendering && descInfo.fHasVertexCoverage;
-
-    bool covIsSolidWhite = !hasVertexCoverage && 0xffffffff == optState.getCoverageColor();
-
-    if (covIsSolidWhite || !inputCoverageIsUsed) {
-        header->fCoverageInput = GrProgramDesc::kAllOnes_ColorInput;
-    } else if (!hasVertexCoverage) {
-        header->fCoverageInput = GrProgramDesc::kUniform_ColorInput;
-    } else {
         header->fCoverageInput = GrProgramDesc::kAttribute_ColorInput;
-        SkASSERT(!header->fUseNvpr);
     }
 
     if (descInfo.fReadsDst) {
         const GrDeviceCoordTexture* dstCopy = optState.getDstCopy();
         SkASSERT(dstCopy || gpu->caps()->dstReadInShaderSupport());
         const GrTexture* dstCopyTexture = NULL;
         if (dstCopy) {
             dstCopyTexture = dstCopy->texture();
         }
         header->fDstReadKey = GrGLFragmentShaderBuilder::KeyForDstRead(dstCopyTexture,
@@ skipping 12 matching lines @@
     }
 
     header->fPrimaryOutputType = descInfo.fPrimaryOutputType;
     header->fSecondaryOutputType = descInfo.fSecondaryOutputType;
 
     header->fColorEffectCnt = optState.numColorStages();
     header->fCoverageEffectCnt = optState.numCoverageStages();
     desc->finalize();
     return true;
 }