diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-05-03 09:49:07 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-03 14:13:41 +0000 |
| commit | 796001c82eca5651bc6a221204f6186918781daf (patch) | |
| tree | 6afce852c893eab7c313cb3c5f869c56e3a6d5e1 /src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp | |
| parent | 131154be103d3706470aa3ce2c17fafde3493490 (diff) | |
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>
Diffstat (limited to 'src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp')
| -rw-r--r-- | src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp index b4f13143d8..324c61efeb 100644 --- a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp +++ b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp @@ -91,10 +91,7 @@ void GrGLConvolutionEffect::emitCode(EmitArgs& args) { } fragBuilder->codeAppendf("coord += %s;\n", imgInc); } - - SkString modulate; - GrGLSLMulVarBy4f(&modulate, args.fOutputColor, args.fInputColor); - fragBuilder->codeAppend(modulate.c_str()); + fragBuilder->codeAppendf("%s *= %s;\n", args.fOutputColor, args.fInputColor); } void GrGLConvolutionEffect::onSetData(const GrGLSLProgramDataManager& pdman, |