Don't use __ARM_HAVE_NEON to detect NEON's presence in SkBlitter_RGB16

Replace __ARM_HAVE_NEON by SK_ARM_NEON_IS_ALWAYS. It was the only
use of __ARM_HAVE_NEON apart from defining SK_ARM_NEON_IS_ALWAYS.

Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
BUG=skia:
R=djsollen@google.com, mtklein@google.com, halcanary@google.com, reed@google.com

Author: kevin.petit@arm.com

Review URL: https://codereview.chromium.org/206543002

git-svn-id: http://skia.googlecode.com/svn/trunk@13880 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/src/core/SkBlitter_RGB16.cpp b/src/core/SkBlitter_RGB16.cpp
index b01800b..ef38be4 100644 (file)
--- a/src/core/SkBlitter_RGB16.cpp
+++ b/src/core/SkBlitter_RGB16.cpp
@@ -15,8 +15,7 @@
 #include "SkUtils.h"
 #include "SkXfermode.h"
 
-#if defined(__ARM_HAVE_NEON) && defined(SK_CPU_LENDIAN)
-    #define SK_USE_NEON
+#if SK_ARM_NEON_IS_ALWAYS && defined(SK_CPU_LENDIAN)
     #include <arm_neon.h>
 #else
     // if we don't have neon, then our black blitter is worth the extra code
@@ -384,7 +383,7 @@ void SkRGB16_Opaque_Blitter::blitMask(const SkMask& mask,
     unsigned    maskRB = mask.fRowBytes - width;
     uint32_t    expanded32 = fExpandedRaw16;
 
-#ifdef SK_USE_NEON
+#if SK_ARM_NEON_IS_ALWAYS && defined(SK_CPU_LENDIAN)
 #define    UNROLL    8
     do {
         int w = width;