Express (GLSL expression, possibly known value) pairs as a class

src/gpu/gl/GrGLShaderBuilder.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLShaderBuilder_DEFINED
 #define GrGLShaderBuilder_DEFINED
 
@@ skipping 220 matching lines @@
 
     /** Returns the color of the destination pixel. This may be NULL if no effect advertised
         that it will read the destination. */
     const char* dstColor();
 
     /**
      * Interfaces used by GrGLProgram.
      * TODO: These are used by GrGLProgram to insert a mode color filter. Remove these when the
      * color filter is expressed as a GrEffect.
      */
-    const SkString& getInputColor() const { return fInputColor; }
-    GrSLConstantVec getKnownColorValue() const { return fKnownColorValue; }
-    const SkString& getInputCoverage() const { return fInputCoverage; }
-    GrSLConstantVec getKnownCoverageValue() const { return fKnownCoverageValue; }
+    const GrGLSLExpr<4>& getInputColor() const { return fInputColor; }
+    const GrGLSLExpr<4>& getInputCoverage() const { return fInputCoverage; }
 
     /**
      * Adds code for effects. effectStages contains the effects to add. effectKeys[i] is the key
      * generated from effectStages[i]. An entry in effectStages can be NULL, in which case it is
      * skipped. Moreover, if the corresponding key is GrGLEffect::NoEffectKey then it is skipped.
      * inOutFSColor specifies the input color to the first stage and is updated to be the
-     * output color of the last stage. fsInOutColorKnownValue specifies whether the input color
-     * has a known constant value and is updated to refer to the status of the output color.
+     * output color of the last stage.
      * The handles to texture samplers for effectStage[i] are added to effectSamplerHandles[i]. The
      * glEffects array is updated to contain the GrGLEffect generated for each entry in
      * effectStages.
      */
     void emitEffects(const GrEffectStage* effectStages[],
                      const GrBackendEffectFactory::EffectKey effectKeys[],
                      int effectCnt,
-                     SkString*  inOutFSColor,
-                     GrSLConstantVec* fsInOutColorKnownValue,
+                     GrGLSLExpr<4>* inOutFSColor,
                      SkTArray<GrGLUniformManager::UniformHandle, true>* effectSamplerHandles[],
                      GrGLEffect* glEffects[]);
 
     const char* getColorOutputName() const;
     const char* enableSecondaryOutput();
 
     GrGLUniformManager::UniformHandle getRTHeightUniform() const { return fRTHeightUniform; }
     GrGLUniformManager::UniformHandle getDstCopyTopLeftUniform() const {
         return fDstCopyTopLeftUniform;
     }
@@ skipping 197 matching lines @@
     SkString                            fFSFunctions;
     SkString                            fFSExtensions;
     VarArray                            fFSInputs;
     VarArray                            fFSOutputs;
 
     SkString                            fFSCode;
 
     bool                                fSetupFragPosition;
     TextureSampler                      fDstCopySampler;
 
-    SkString                            fInputColor;
-    GrSLConstantVec                     fKnownColorValue;
-    SkString                            fInputCoverage;
-    GrSLConstantVec                     fKnownCoverageValue;
+    GrGLSLExpr<4>                       fInputColor;
+    GrGLSLExpr<4>                       fInputCoverage;
 
     bool                                fHasCustomColorOutput;
     bool                                fHasSecondaryOutput;
 
     GrGLUniformManager::UniformHandle   fRTHeightUniform;
     GrGLUniformManager::UniformHandle   fDstCopyTopLeftUniform;
     GrGLUniformManager::UniformHandle   fDstCopyScaleUniform;
     GrGLUniformManager::UniformHandle   fColorUniform;
     GrGLUniformManager::UniformHandle   fCoverageUniform;
 
     bool                                fTopLeftFragPosRead;
 
     SkAutoTDelete<VertexBuilder>        fVertexBuilder;
 };
 
 #endif