diff options
author | Mike Klein <mtklein@chromium.org> | 2017-06-13 22:01:22 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-13 22:01:29 +0000 |
commit | 4f8c695736c8ae4fed2190a8e1301a4f4a979898 (patch) | |
tree | cd6d227170579292b755470dfd3f24cc5a54e823 /src/effects/SkLayerDrawLooper.cpp | |
parent | 9e99b3de69b29f6a6511ef7b90e24442478be1e2 (diff) |
Revert "use pipeline for non-opt xfermodes"
This reverts commit e93cf97175d348ce1400762bdd8d9acabdd29766.
Reason for revert: unblock Chrome roll
Original change's description:
> use pipeline for non-opt xfermodes
>
> Produces slightly different results for Hue, Saturation, Color, Luminosity,
> seemingly around the aa edging.
>
> Bug: skia:
> Change-Id: I6364818c9788863e5fad6d14cad4797d073dbea3
> Reviewed-on: https://skia-review.googlesource.com/19554
> Reviewed-by: Mike Klein <mtklein@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
TBR=mtklein@google.com,fmalita@chromium.org,reed@google.com
Change-Id: Ib85a51753d21ce778fa5cfedd6b7d1b5b2b87096
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/19745
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'src/effects/SkLayerDrawLooper.cpp')
-rw-r--r-- | src/effects/SkLayerDrawLooper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/effects/SkLayerDrawLooper.cpp b/src/effects/SkLayerDrawLooper.cpp index 7dff657c52..4fb629376e 100644 --- a/src/effects/SkLayerDrawLooper.cpp +++ b/src/effects/SkLayerDrawLooper.cpp @@ -54,8 +54,8 @@ static SkColor xferColor(SkColor src, SkColor dst, SkBlendMode mode) { default: { SkPMColor pmS = SkPreMultiplyColor(src); SkPMColor pmD = SkPreMultiplyColor(dst); - SkXfermode::Peek(mode)->xfer32(&pmD, &pmS, 1, nullptr); - return SkUnPreMultiply::PMColorToColor(pmD); + SkPMColor result = SkXfermode::GetProc(mode)(pmS, pmD); + return SkUnPreMultiply::PMColorToColor(result); } } } |