diff options
author | 2017-08-08 15:10:53 -0400 | |
---|---|---|
committer | 2017-08-08 21:31:39 +0000 | |
commit | 4d011bef0adb7f7bf52e96364a02b2af1312255b (patch) | |
tree | 3252359da7ac708fc07d8e66e13c5ce219ed4203 | |
parent | 1af6d68dad3490ee59daac0e461da5a3ebdb0bd0 (diff) |
Remove unneeded GrGradientEffect Tegra3 workaround
The workaround for canUseMinAndAbsTogether() is implemented in
GLSLCodeGenerator, so presumably not needed here.
(0ac06e47269a40c177747310a613d213c95d1d6d&l=223">https://cs.chromium.org/chromium/src/third_party/skia/src/sksl/SkSLGLSLCodeGenerator.cpp?rcl=0ac06e47269a40c177747310a613d213c95d1d6d&l=223)
Change-Id: Id8179ff17b929ed2d79ef9463c0f2008f3591b00
Reviewed-on: https://skia-review.googlesource.com/32181
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
-rw-r--r-- | src/shaders/gradients/SkGradientShader.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/shaders/gradients/SkGradientShader.cpp b/src/shaders/gradients/SkGradientShader.cpp index 767955a18a..b92bf59ab6 100644 --- a/src/shaders/gradients/SkGradientShader.cpp +++ b/src/shaders/gradients/SkGradientShader.cpp @@ -1622,16 +1622,8 @@ void GrGradientEffect::GLSLProcessor::emitAnalyticalColor(GrGLSLFPFragmentBuilde fragBuilder->codeAppendf("float oneMinus2t = 1.0 - (2.0 * clamp_t);"); fragBuilder->codeAppendf("float4 colorTemp = clamp(oneMinus2t, 0.0, 1.0) * %s[0];", colors); - if (!shaderCaps->canUseMinAndAbsTogether()) { - // The Tegra3 compiler will sometimes never return if we have - // min(abs(oneMinus2t), 1.0), or do the abs first in a separate expression. - fragBuilder->codeAppendf("float minAbs = abs(oneMinus2t);"); - fragBuilder->codeAppendf("minAbs = minAbs > 1.0 ? 1.0 : minAbs;"); - fragBuilder->codeAppendf("colorTemp += (1.0 - minAbs) * %s[1];", colors); - } else { - fragBuilder->codeAppendf("colorTemp += (1.0 - min(abs(oneMinus2t), 1.0)) * %s[1];", - colors); - } + fragBuilder->codeAppendf("colorTemp += (1.0 - min(abs(oneMinus2t), 1.0)) * %s[1];", + colors); fragBuilder->codeAppendf("colorTemp += clamp(-oneMinus2t, 0.0, 1.0) * %s[2];", colors); break; |