aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@google.com>2015-05-14 10:18:14 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-05-14 10:18:14 -0700
commitaf953bbdfbd4edcd53fc4a5e1cb21bc9ce6f93e5 (patch)
tree3405d0d06698e6c27d1f0cc0ea91526fba3011bc
parente578a95d3ab16544794b94da4e7ae13fc2ce6244 (diff)
Revert of Temporarily revert just Multiply to see if that's the source of NEON diffs. (patchset #1 id:1 of https://codereview.chromium.org/1129293005/)
Reason for revert: Diff's still there. Multiply is not the culprit. Original issue's description: > Temporarily revert just Multiply to see if that's the source of NEON diffs. > > Local testing is confusing and inconclusive. Pulling out the big guns. > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/5b9f352ff1e245dd48e200f8f8b683f4569547d3 TBR=mtklein@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1143553004
-rw-r--r--src/core/SkXfermode.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
index 28f247bbba..2abe55a8ca 100644
--- a/src/core/SkXfermode.cpp
+++ b/src/core/SkXfermode.cpp
@@ -1493,9 +1493,7 @@ SkXfermode* create_mode(int iMode) {
case SkXfermode::kPlus_Mode: return SkT4pxXfermode<Plus4f>::Create(rec);
case SkXfermode::kModulate_Mode: return SkT4pxXfermode<Modulate4f>::Create(rec);
case SkXfermode::kScreen_Mode: return SkT4pxXfermode<Screen4f>::Create(rec);
- // Temporarily reverted to see if this is what's causing NEON diffs.
- // If not, will try Xor, DstATop, then SrcATop in that order.
- //case SkXfermode::kMultiply_Mode: return SkT4pxXfermode<Multiply4f>::Create(rec);
+ case SkXfermode::kMultiply_Mode: return SkT4pxXfermode<Multiply4f>::Create(rec);
default: break;
}
#endif