diff options
author | mtklein <mtklein@google.com> | 2015-06-29 09:37:29 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-29 09:37:29 -0700 |
commit | 4b41827b74ba4bcce919988b54f81414184d8ca6 (patch) | |
tree | afea5b70c50ddebba500c2efa746c158f59f9fa5 /src/core | |
parent | 884200ef76bbd25ab31e061a24cc8c8268dacca0 (diff) |
Revert of SoftLight with SkPMFloat (patchset #6 id:100001 of https://codereview.chromium.org/1221493002/)
Reason for revert:
xfermodes and xfermodes2 show major diffs on Nexus 5 and Daisy (both ARMv7 w/NEON). Nexus 9 and SSE all look fine...
Original issue's description:
> SoftLight with SkPMFloat
>
> SSE speeds up about 4.5x over existing integer SSE,
> NEON speeds up about 3x over serial integer code.
>
> We expect 1-2 bit component diffs in the usual GMs.
>
> Still guarded by SK_SUPPORT_LEGACY_XFERMODES,
> which I'll now try to lift in Chrome.
>
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/3e47d49b46b3ab62071218ef3dd44642c9713e04
TBR=reed@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1221683002
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/Sk4pxXfermode.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/core/Sk4pxXfermode.h b/src/core/Sk4pxXfermode.h index 28fd9f1e7b..b587183046 100644 --- a/src/core/Sk4pxXfermode.h +++ b/src/core/Sk4pxXfermode.h @@ -141,31 +141,6 @@ XFERMODE(ColorBurn) { otherwise)); return srcover * SkPMFloat(1,0,0,0) + colors * SkPMFloat(0,1,1,1); } -XFERMODE(SoftLight) { - auto sa = s.alphas(), - da = d.alphas(), - isa = Sk4f(1)-sa, - ida = Sk4f(1)-da; - - // Some common terms. - auto m = (da > Sk4f(0)).thenElse(d / da, Sk4f(0)), - s2 = Sk4f(2)*s, - m4 = Sk4f(4)*m; - - // The logic forks three ways: - // 1. dark src? - // 2. light src, dark dst? - // 3. light src, light dst? - auto darkSrc = d*(sa + (s2 - sa)*(Sk4f(1) - m)), // Used in case 1. - darkDst = (m4*m4 + m4)*(m - Sk4f(1)) + Sk4f(7)*m, // Used in case 2. - liteDst = m.sqrt() - m, // Used in case 3. - liteSrc = d*sa + da*(s2-sa)*(Sk4f(4)*d < da).thenElse(darkDst, liteDst); // Case 2 or 3? - - auto alpha = s + d*isa; - auto colors = s*ida + d*isa + (s2 < sa).thenElse(darkSrc, liteSrc); // Case 1 or 2/3? - - return alpha * SkPMFloat(1,0,0,0) + colors * SkPMFloat(0,1,1,1); -} #undef XFERMODE // A reasonable fallback mode for doing AA is to simply apply the transfermode first, @@ -269,7 +244,6 @@ static SkProcCoeffXfermode* SkCreate4pxXfermode(const ProcCoeff& rec, SkXfermode case SkXfermode::kColorDodge_Mode: return SkTPMFloatXfermode<ColorDodge>::Create(rec); case SkXfermode::kColorBurn_Mode: return SkTPMFloatXfermode<ColorBurn>::Create(rec); - case SkXfermode::kSoftLight_Mode: return SkTPMFloatXfermode<SoftLight>::Create(rec); #endif default: break; } |