Remove fModulate from GrGLShaderBuilder

Review URL: https://codereview.appspot.com/6495051/




git-svn-id: http://skia.googlecode.com/svn/trunk@5350 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 10 insertions, 5 deletions

diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp
index 891b1cdf9b..3d989b7611 100644
--- a/src/effects/gradients/SkGradientShader.cpp
+++ b/src/effects/gradients/SkGradientShader.cpp
@@ -699,14 +699,19 @@ void GrGLGradientStage::setData(const GrGLUniformManager& uman,
 }
 
 void GrGLGradientStage::emitColorLookup(GrGLShaderBuilder* builder,
-                                        const char* tName,
+                                        const char* gradientTValue,
                                         const char* outputColor,
+                                        const char* inputColor,
                                         const char* samplerName) {
 
-    builder->fFSCode.appendf("\tvec2 coord = vec2(%s, %s);\n",
-                             tName,
-                             builder->getUniformVariable(fFSYUni).c_str());
-    builder->emitTextureLookupAndModulate(outputColor, samplerName, "coord");
+    SkString* code = &builder->fFSCode;
+    code->appendf("\tvec2 coord = vec2(%s, %s);\n",
+                  gradientTValue,
+                  builder->getUniformVariable(fFSYUni).c_str());
+    GrGLSLMulVarBy4f(code, 1, outputColor, inputColor);
+    code->appendf("\t%s = ", outputColor);
+    builder->appendTextureLookupAndModulate(code, inputColor, samplerName, "coord");
+    code->append(";\n");
 }
 
 /////////////////////////////////////////////////////////////////////