diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-05-04 13:10:59 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-04 13:11:09 +0000 |
| commit | 421fe443f833c916e6c3616f92570c8920b030f9 (patch) | |
| tree | f71a0ee54350b5ad77512976f0363b8e62476028 /src/effects/gradients | |
| parent | 5c1b360a89f85accd7dc446670f6f062c73e7e77 (diff) | |
Revert "Revert "Revert "eliminated GrGLSLExpr"""
This reverts commit 796001c82eca5651bc6a221204f6186918781daf.
Reason for revert: looks to be causing problems in Chrome (https://storage.googleapis.com/chromium-layout-test-archives/WebKit_Linux_Trusty__dbg_/1553/layout-test-results/results.html)
Original change's description:
> 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>
>
TBR=ethannicholas@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I6455a4f16b2dc0d6d1265541f7117e0cfb8dd91c
Reviewed-on: https://skia-review.googlesource.com/15309
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/effects/gradients')
| -rw-r--r-- | src/effects/gradients/SkGradientShader.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index f1cf1954ad..276eaac8ed 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -1434,7 +1434,8 @@ void GrGradientEffect::GLSLProcessor::emitColor(GrGLSLFPFragmentBuilder* fragBui if (ge.fColorSpaceXform) { fragBuilder->codeAppend("colorTemp.rgb = clamp(colorTemp.rgb, 0, colorTemp.a);"); } - fragBuilder->codeAppendf("%s = %s * colorTemp;", outputColor, inputColor); + fragBuilder->codeAppendf("%s = %s;", outputColor, + (GrGLSLExpr4(inputColor) * GrGLSLExpr4("colorTemp")).c_str()); break; } @@ -1472,7 +1473,8 @@ void GrGradientEffect::GLSLProcessor::emitColor(GrGLSLFPFragmentBuilder* fragBui if (ge.fColorSpaceXform) { fragBuilder->codeAppend("colorTemp.rgb = clamp(colorTemp.rgb, 0, colorTemp.a);"); } - fragBuilder->codeAppendf("%s = %s * colorTemp;", outputColor, inputColor); + fragBuilder->codeAppendf("%s = %s;", outputColor, + (GrGLSLExpr4(inputColor) * GrGLSLExpr4("colorTemp")).c_str()); break; } @@ -1510,7 +1512,8 @@ void GrGradientEffect::GLSLProcessor::emitColor(GrGLSLFPFragmentBuilder* fragBui if (ge.fColorSpaceXform) { fragBuilder->codeAppend("colorTemp.rgb = clamp(colorTemp.rgb, 0, colorTemp.a);"); } - fragBuilder->codeAppendf("%s = %s * colorTemp;", outputColor, inputColor); + fragBuilder->codeAppendf("%s = %s;", outputColor, + (GrGLSLExpr4(inputColor) * GrGLSLExpr4("colorTemp")).c_str()); break; } @@ -1536,7 +1539,8 @@ void GrGradientEffect::GLSLProcessor::emitColor(GrGLSLFPFragmentBuilder* fragBui fragBuilder->codeAppend("colorTemp.rgb = clamp(colorTemp.rgb, 0, colorTemp.a);"); } - fragBuilder->codeAppendf("%s = %s * colorTemp;", outputColor, inputColor); + fragBuilder->codeAppendf("%s = %s;", outputColor, + (GrGLSLExpr4(inputColor) * GrGLSLExpr4("colorTemp")).c_str()); break; } @@ -1567,7 +1571,8 @@ void GrGradientEffect::GLSLProcessor::emitColor(GrGLSLFPFragmentBuilder* fragBui fragBuilder->codeAppend("colorTemp.rgb = clamp(colorTemp.rgb, 0, colorTemp.a);"); } - fragBuilder->codeAppendf("%s = %s * colorTemp;", outputColor, inputColor); + fragBuilder->codeAppendf("%s = %s;", outputColor, + (GrGLSLExpr4(inputColor) * GrGLSLExpr4("colorTemp")).c_str()); break; } |