aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@google.com>2015-05-14 11:49:01 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-05-14 11:49:01 -0700
commitec1f77d097fa86f5d126a1676b97eea7cff3fdbf (patch)
tree3405d0d06698e6c27d1f0cc0ea91526fba3011bc
parent6095260e55ac5f263df26cdde427531a0e7da8dd (diff)
Revert of Temporarily revert just Multiply to see if that's the source of NEON diffs. (patchset #2 id:20001 of https://codereview.chromium.org/1129293005/)
Reason for revert: Undo Xor revert. Getting too confusing now. 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 > > Committed: https://skia.googlesource.com/skia/+/6095260e55ac5f263df26cdde427531a0e7da8dd TBR=mtklein@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1138073005
-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 4555a85053..2abe55a8ca 100644
--- a/src/core/SkXfermode.cpp
+++ b/src/core/SkXfermode.cpp
@@ -1489,9 +1489,7 @@ SkXfermode* create_mode(int iMode) {
switch (mode) {
case SkXfermode::kSrcATop_Mode: return SkT4pxXfermode<SrcATop4f>::Create(rec);
case SkXfermode::kDstATop_Mode: return SkT4pxXfermode<DstATop4f>::Create(rec);
- // Temporarily reverted to see if this is the source of NEON diffs.
- // If not, try DstATop then SrcATop next. Multiply is not the problem.
- // case SkXfermode::kXor_Mode: return SkT4pxXfermode<Xor4f>::Create(rec);
+ case SkXfermode::kXor_Mode: return SkT4pxXfermode<Xor4f>::Create(rec);
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);