commit 796001c82eca5651bc6a221204f6186918781daf
author Ethan Nicholas <ethannicholas@google.com> Wed May 03 09:49:07 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 03 14:13:41 2017 +0000
tree 6afce852c893eab7c313cb3c5f869c56e3a6d5e1
parent 131154be103d3706470aa3ce2c17fafde3493490

Revert "Revert "eliminated GrGLSLExpr""

This reverts commit 5e550ab57e0204bfadd2cb69c47d2a85e38d6a4c.

Bug: skia:
Change-Id: I4705e47dbd209aa8f43db3d28c856bd3aa9e49ab
Reviewed-on: https://skia-review.googlesource.com/15187
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/gpu/effects/GrMatrixConvolutionEffect.cpp

diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
index 03d90ea..b3ea81a 100644
--- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp
+++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
@@ -114,10 +114,7 @@
         fragBuilder->codeAppendf("%s.rgb = clamp(sum.rgb * %s + %s, 0, 1);", args.fOutputColor, gain, bias);
         fragBuilder->codeAppendf("%s.rgb *= %s.a;", args.fOutputColor, args.fOutputColor);
     }
-
-    SkString modulate;
-    GrGLSLMulVarBy4f(&modulate, args.fOutputColor, args.fInputColor);
-    fragBuilder->codeAppend(modulate.c_str());
+    fragBuilder->codeAppendf("%s *= %s;\n", args.fOutputColor, args.fInputColor);
 }
 
 void GrGLMatrixConvolutionEffect::GenKey(const GrProcessor& processor,