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
This commit is contained in:
mtklein 2015-05-14 11:49:01 -07:00 committed by Commit bot
parent 6095260e55
commit ec1f77d097

View File

@ -1489,9 +1489,7 @@ SkXfermode* create_mode(int iMode) {
switch (mode) { switch (mode) {
case SkXfermode::kSrcATop_Mode: return SkT4pxXfermode<SrcATop4f>::Create(rec); case SkXfermode::kSrcATop_Mode: return SkT4pxXfermode<SrcATop4f>::Create(rec);
case SkXfermode::kDstATop_Mode: return SkT4pxXfermode<DstATop4f>::Create(rec); case SkXfermode::kDstATop_Mode: return SkT4pxXfermode<DstATop4f>::Create(rec);
// Temporarily reverted to see if this is the source of NEON diffs. case SkXfermode::kXor_Mode: return SkT4pxXfermode<Xor4f>::Create(rec);
// If not, try DstATop then SrcATop next. Multiply is not the problem.
// case SkXfermode::kXor_Mode: return SkT4pxXfermode<Xor4f>::Create(rec);
case SkXfermode::kPlus_Mode: return SkT4pxXfermode<Plus4f>::Create(rec); case SkXfermode::kPlus_Mode: return SkT4pxXfermode<Plus4f>::Create(rec);
case SkXfermode::kModulate_Mode: return SkT4pxXfermode<Modulate4f>::Create(rec); case SkXfermode::kModulate_Mode: return SkT4pxXfermode<Modulate4f>::Create(rec);
case SkXfermode::kScreen_Mode: return SkT4pxXfermode<Screen4f>::Create(rec); case SkXfermode::kScreen_Mode: return SkT4pxXfermode<Screen4f>::Create(rec);