commit 074424a4ac5b093331df2c92e7a5bcbfff136b71
author Jason Sams <jsams@google.com> Thu May 22 13:30:03 2014 -0700
committer Jason Sams <jsams@google.com> Thu May 22 13:53:23 2014 -0700
tree e608959d5221816533f653c3684730a487592ae1
parent f981663b7e4568dea18ea1e9988dd0ee0e48a24e

Enable ARM64 intrinsics.

This also moves ARM intrinsic ifdefs behing ARCH_ARM_USE_INTRINSICS instead of ARCH_ARM_HAVE_VFP.

Change-Id: I48d3d55c77feb931e22288828247e281db43d32b

cpu_ref/rsCpuIntrinsicBlend.cpp

diff --git a/cpu_ref/rsCpuIntrinsicBlend.cpp b/cpu_ref/rsCpuIntrinsicBlend.cpp
index 3af425f..228b887 100644
--- a/cpu_ref/rsCpuIntrinsicBlend.cpp
+++ b/cpu_ref/rsCpuIntrinsicBlend.cpp
@@ -90,7 +90,7 @@
     BLEND_LUMINOSITY = 43
 };
 
-#if defined(ARCH_ARM_HAVE_VFP)
+#if defined(ARCH_ARM_USE_INTRINSICS)
 extern "C" int rsdIntrinsicBlend_K(uchar4 *out, uchar4 const *in, int slot,
                     uint32_t xstart, uint32_t xend);
 #endif
@@ -121,7 +121,7 @@
     uint32_t x1 = xstart;
     uint32_t x2 = xend;
 
-#if defined(ARCH_ARM_HAVE_VFP)
+#if defined(ARCH_ARM_USE_INTRINSICS) && !defined(ARCH_ARM64_USE_INTRINSICS)
     if (gArchUseSIMD) {
         if (rsdIntrinsicBlend_K(out, in, p->slot, x1, x2) >= 0)
             return;