Draft change to start pulling uniform color into GP

src/gpu/gl/builders/GrGLProgramBuilder.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 "GrGLProgramBuilder.h"
 #include "gl/GrGLProgram.h"
 #include "gl/GrGLSLPrettyPrint.h"
@@ skipping 27 matching lines @@
 
     // emit code to read the dst copy texture, if necessary
     if (GrGLFragmentShaderBuilder::kNoDstRead_DstReadKey != header.fDstReadKey
             && !gpu->glCaps().fbFetchSupport()) {
         pb->fFS.emitCodeToReadDstTexture();
     }
 
     // get the initial color and coverage to feed into the first effect in each effect chain
     GrGLSLExpr4 inputColor;
     GrGLSLExpr1 inputCoverage;
-    pb->setupUniformColorAndCoverageIfNeeded(&inputColor,  &inputCoverage);
+
+    // TODO do this in the path processor
+    if (header.fUseNvpr) {
+        pb->setupUniformColorAndCoverageIfNeeded(&inputColor,  &inputCoverage);
+    }
 
     // TODO: Once all stages can handle taking a float or vec4 and correctly handling them we can
     // remove this cast to a vec4.
     GrGLSLExpr4 inputCoverageVec4;
     if (inputCoverage.isValid()) {
         inputCoverageVec4 = GrGLSLExpr4::VectorCast(inputCoverage);
     }
 
     pb->emitAndInstallProcs(&inputColor, &inputCoverageVec4);
 
     return pb->finalize();
 }
 
 GrGLProgramBuilder* GrGLProgramBuilder::CreateProgramBuilder(const GrOptDrawState& optState,
                                                              bool hasGeometryProcessor,
                                                              GrGpuGL* gpu) {
     const GrProgramDesc& desc = optState.programDesc();
     if (GrGLProgramDescBuilder::GetHeader(desc).fUseNvpr) {
         SkASSERT(gpu->glCaps().pathRenderingSupport());
-        SkASSERT(GrProgramDesc::kAttribute_ColorInput != desc.header().fColorInput);
-        SkASSERT(GrProgramDesc::kAttribute_ColorInput != desc.header().fCoverageInput);
         SkASSERT(!hasGeometryProcessor);
         if (gpu->glPathRendering()->texturingMode() ==
             GrGLPathRendering::FixedFunction_TexturingMode) {
             return SkNEW_ARGS(GrGLLegacyNvprProgramBuilder, (gpu, optState));
         } else {
             return SkNEW_ARGS(GrGLNvprProgramBuilder, (gpu, optState));
         }
     } else {
         return SkNEW_ARGS(GrGLProgramBuilder, (gpu, optState));
     }
@@ skipping 100 matching lines @@
         }
     }
 }
 
 const GrGLContextInfo& GrGLProgramBuilder::ctxInfo() const {
     return fGpu->ctxInfo();
 }
 
 void GrGLProgramBuilder::setupUniformColorAndCoverageIfNeeded(GrGLSLExpr4* inputColor,
                                                               GrGLSLExpr1* inputCoverage) {
-    const GrProgramDesc::KeyHeader& header = this->header();
-    if (GrProgramDesc::kUniform_ColorInput == header.fColorInput) {
-        const char* name;
-        fUniformHandles.fColorUni =
-            this->addUniform(GrGLProgramBuilder::kFragment_Visibility,
-                             kVec4f_GrSLType, kDefault_GrSLPrecision,
-                             "Color", &name);
-        *inputColor = GrGLSLExpr4(name);
-    } else if (GrProgramDesc::kAllOnes_ColorInput == header.fColorInput) {
-        *inputColor = GrGLSLExpr4(1);
-    }
-    if (GrProgramDesc::kUniform_ColorInput == header.fCoverageInput) {
-        const char* name;
-        fUniformHandles.fCoverageUni =
-            this->addUniform(GrGLProgramBuilder::kFragment_Visibility,
-                             kFloat_GrSLType, kDefault_GrSLPrecision,
-                             "Coverage",&name);
-        *inputCoverage = GrGLSLExpr1(name);
-    } else if (GrProgramDesc::kAllOnes_ColorInput == header.fCoverageInput) {
-        *inputCoverage = GrGLSLExpr1(1);
-    }
+    const char* name;
+    fUniformHandles.fColorUni =
+        this->addUniform(GrGLProgramBuilder::kFragment_Visibility,
+                         kVec4f_GrSLType, kDefault_GrSLPrecision,
+                         "Color", &name);
+    *inputColor = GrGLSLExpr4(name);
+    *inputCoverage = GrGLSLExpr1(1);
 }
 
 void GrGLProgramBuilder::emitAndInstallProcs(GrGLSLExpr4* inputColor, GrGLSLExpr4* inputCoverage) {
     if (fOptState.hasGeometryProcessor()) {
         fVS.setupUniformViewMatrix();
 
-        const GrProgramDesc::KeyHeader& header = this->header();
         fVS.codeAppend("gl_PointSize = 1.0;");
 
         // Setup position
         // TODO it'd be possible to remove these from the vertexshader builder and have them
         // be outputs from the emit call.  We don't do this because emitargs is constant.  It would
         // be easy to change this though
         fVS.codeAppendf("vec3 %s;", fVS.glPosition());
         fVS.codeAppendf("vec2 %s;", fVS.positionCoords());
         fVS.codeAppendf("vec2 %s;", fVS.localCoords());
 
         const GrGeometryProcessor& gp = *fOptState.getGeometryProcessor();
         fVS.emitAttributes(gp);
-        GrGLSLExpr4 outputColor;
-        GrGLSLExpr4 outputCoverage;
-        this->emitAndInstallProc(gp, &outputColor, &outputCoverage);
-
-        // We may override color and coverage here if we have unform color or coverage.  This is
-        // obviously not ideal.
-        // TODO lets the GP itself do the override
-        if (GrProgramDesc::kAttribute_ColorInput == header.fColorInput) {
-            *inputColor = outputColor;
-        }
-
-        // We may have uniform coverage, if so we need to multiply the GPs output by the uniform
-        // coverage
-        if (GrProgramDesc::kUniform_ColorInput == header.fCoverageInput) {
-            fFS.codeAppendf("%s *= %s;", outputCoverage.c_str(), inputCoverage->c_str());
-        }
-        *inputCoverage = outputCoverage;
+        this->emitAndInstallProc(gp, inputColor, inputCoverage);
     }
 
     fFragmentProcessors.reset(SkNEW(GrGLInstalledFragProcs));
     int numProcs = fOptState.numFragmentStages();
     this->emitAndInstallFragProcs(0, fOptState.numColorStages(), inputColor);
     this->emitAndInstallFragProcs(fOptState.numColorStages(), numProcs,  inputCoverage);
 
     if (fOptState.hasGeometryProcessor()) {
         fVS.transformToNormalizedDeviceSpace();
     }
@@ skipping 225 matching lines @@
 GrGLProgram* GrGLProgramBuilder::finalize() {
     // verify we can get a program id
     GrGLuint programID;
     GL_CALL_RET(programID, CreateProgram());
     if (0 == programID) {
         return NULL;
     }
 
     // compile shaders and bind attributes / uniforms
     SkTDArray<GrGLuint> shadersToDelete;
-    if (!fFS.compileAndAttachShaders(programID, &shadersToDelete)) {
-        this->cleanupProgram(programID, shadersToDelete);
-        return NULL;
-    }
-
     if (!(GrGLProgramDescBuilder::GetHeader(fDesc).fUseNvpr &&
           fGpu->glPathRendering()->texturingMode() ==
           GrGLPathRendering::FixedFunction_TexturingMode)) {
         if (!fVS.compileAndAttachShaders(programID, &shadersToDelete)) {
             this->cleanupProgram(programID, shadersToDelete);
             return NULL;
         }
 
         // Non fixed function NVPR actually requires a vertex shader to compile
         if (fOptState.hasGeometryProcessor()) {
             fVS.bindVertexAttributes(programID);
         }
     }
+
+    if (!fFS.compileAndAttachShaders(programID, &shadersToDelete)) {
+        this->cleanupProgram(programID, shadersToDelete);
+        return NULL;
+    }
+
     bool usingBindUniform = fGpu->glInterface()->fFunctions.fBindUniformLocation != NULL;
     if (usingBindUniform) {
         this->bindUniformLocations(programID);
     }
     fFS.bindFragmentShaderLocations(programID);
     GL_CALL(LinkProgram(programID));
 
     // Calling GetProgramiv is expensive in Chromium. Assume success in release builds.
     bool checkLinked = !fGpu->ctxInfo().isChromium();
 #ifdef SK_DEBUG
@@ skipping 68 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 GrGLInstalledFragProcs::~GrGLInstalledFragProcs() {
     int numProcs = fProcs.count();
     for (int e = 0; e < numProcs; ++e) {
         SkDELETE(fProcs[e]);
     }
 }