Revert "Revert "SkNx basically always is fast now.""

This reverts commit 8ba64d1996ba6c9ecfb12132cdab7d5d99af7456.

Reason for revert: does not appear to have been blocking the roll.

Original change's description:
> Revert "SkNx basically always is fast now."
> 
> This reverts commit 21f783829619186442041de6008f7f58f4f6250d.
> 
> Reason for revert: roll?
> 
> Original change's description:
> > SkNx basically always is fast now.
> > 
> > We had this SKNX_IS_FAST hanging around from before Chrome always built with NEON.
> > 
> > CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
> > 
> > Change-Id: Ia5cc0323b3ef052192e2903f961aee11eb3f82d8
> > Reviewed-on: https://skia-review.googlesource.com/5946
> > Commit-Queue: Mike Klein <mtklein@chromium.org>
> > Reviewed-by: Mike Reed <reed@google.com>
> > Reviewed-by: Florin Malita <fmalita@chromium.org>
> > 
> 
> TBR=mtklein@chromium.org,fmalita@chromium.org,reed@google.com,reviews@skia.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> 
> Change-Id: I0e57285c68eae0a64213fe29ea4cca5519777954
> Reviewed-on: https://skia-review.googlesource.com/6040
> Commit-Queue: Mike Klein <mtklein@chromium.org>
> Reviewed-by: Mike Klein <mtklein@chromium.org>
> 

TBR=mtklein@chromium.org,reviews@skia.org,fmalita@chromium.org,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: I230dd4c2abb2d14ffc302be5376b9eaacbbeafcc
Reviewed-on: https://skia-review.googlesource.com/6026
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>

1 files changed, 0 insertions, 9 deletions

diff --git a/src/core/SkMipMap.cpp b/src/core/SkMipMap.cpp
index ba3cb18749..987949fea0 100644
--- a/src/core/SkMipMap.cpp
+++ b/src/core/SkMipMap.cpp
@@ -23,7 +23,6 @@
 
 struct ColorTypeFilter_8888 {
     typedef uint32_t Type;
-#if defined(SKNX_IS_FAST)
     static Sk4h Expand(uint32_t x) {
         return SkNx_cast<uint16_t>(Sk4b::Load(&x));
     }
@@ -32,14 +31,6 @@ struct ColorTypeFilter_8888 {
         SkNx_cast<uint8_t>(x).store(&r);
         return r;
     }
-#else
-    static uint64_t Expand(uint32_t x) {
-        return (x & 0xFF00FF) | ((uint64_t)(x & 0xFF00FF00) << 24);
-    }
-    static uint32_t Compact(uint64_t x) {
-        return (uint32_t)((x & 0xFF00FF) | ((x >> 24) & 0xFF00FF00));
-    }
-#endif
 };
 
 struct ColorTypeFilter_S32 {