diff options
author | Brian Salomon <bsalomon@google.com> | 2017-05-02 21:07:25 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-02 21:07:32 +0000 |
commit | 5e550ab57e0204bfadd2cb69c47d2a85e38d6a4c (patch) | |
tree | a1787bf7363e13f1420a66db2d730644592c8dde /src/effects/GrAlphaThresholdFragmentProcessor.cpp | |
parent | 733340a6997762dc2fe5048cfe5af33bf8293d93 (diff) |
Revert "eliminated GrGLSLExpr"
This reverts commit 93f20f5629e52eed732d2b9d6dbbb351cc30b2cd.
Reason for revert: Mismerge readded deleted files.
Original change's description:
> eliminated GrGLSLExpr
>
> Now that skslc performs all of the optimizations (and then some) that
> GrGLSLExpr is responsible for, it's just extra work for no benefit.
>
> Bug: skia:
> Change-Id: I40b0629e00a33873ed9fc6c0a9f41d8350221f9a
> Reviewed-on: https://skia-review.googlesource.com/14560
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
>
TBR=bsalomon@google.com,ethannicholas@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ia8b723594527afe34489fc78a4b49039081b6390
Reviewed-on: https://skia-review.googlesource.com/15154
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/effects/GrAlphaThresholdFragmentProcessor.cpp')
-rw-r--r-- | src/effects/GrAlphaThresholdFragmentProcessor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/effects/GrAlphaThresholdFragmentProcessor.cpp b/src/effects/GrAlphaThresholdFragmentProcessor.cpp index de1b74e4ce..6c355c1fee 100644 --- a/src/effects/GrAlphaThresholdFragmentProcessor.cpp +++ b/src/effects/GrAlphaThresholdFragmentProcessor.cpp @@ -127,7 +127,8 @@ void GrGLAlphaThresholdFragmentProcessor::emitCode(EmitArgs& args) { "color.a = inner_thresh;" "}"); - fragBuilder->codeAppendf("%s = %s * color;", args.fOutputColor, args.fInputColor); + fragBuilder->codeAppendf("%s = %s;", args.fOutputColor, + (GrGLSLExpr4(args.fInputColor) * GrGLSLExpr4("color")).c_str()); } void GrGLAlphaThresholdFragmentProcessor::onSetData(const GrGLSLProgramDataManager& pdman, |