diff options
author | 2017-05-02 21:07:25 +0000 | |
---|---|---|
committer | 2017-05-02 21:07:32 +0000 | |
commit | 5e550ab57e0204bfadd2cb69c47d2a85e38d6a4c (patch) | |
tree | a1787bf7363e13f1420a66db2d730644592c8dde /src/effects/gradients | |
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/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; } |