summaryrefslogtreecommitdiffstats
path: root/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2014-08-06 11:49:02 -0700
committerTim Murray <timmurray@google.com>2014-08-12 10:37:14 -0700
commit6a45ddb32f391060aa05da6ff09c4814d450586e (patch)
tree779bc1fc13af2a8b72794b3e7074f598e58f62db /cpu_ref/rsCpuIntrinsicYuvToRGB.cpp
parent05ef73f2d934f1083cc3b8aeb33fe21de9d6e88f (diff)
downloadandroid_frameworks_rs-6a45ddb32f391060aa05da6ff09c4814d450586e.tar.gz
android_frameworks_rs-6a45ddb32f391060aa05da6ff09c4814d450586e.tar.bz2
android_frameworks_rs-6a45ddb32f391060aa05da6ff09c4814d450586e.zip
Bugfixes for AArch64.
- Disable use of runtime pointer until we can set it correctly in invokes. - Disable YUV and ColorMatrix ASIMD intrinsics - Modify runtime stubs to use large objects correctly - Fix calling convention in allocation.ll - Add appropriate rsr functions for compat lib and large objects bug 16846318 Change-Id: I7f6a4ff66fd1b3ad40b08cfc9ecdda7d53e95c7d
Diffstat (limited to 'cpu_ref/rsCpuIntrinsicYuvToRGB.cpp')
-rw-r--r--cpu_ref/rsCpuIntrinsicYuvToRGB.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp b/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp
index d9ab98cd..342d0ea4 100644
--- a/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp
+++ b/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp
@@ -161,7 +161,8 @@ void RsdCpuScriptIntrinsicYuvToRGB::kernel(const RsExpandKernelParams *p,
out++;
x1++;
}
-#if defined(ARCH_ARM_USE_INTRINSICS)
+// reenable for ARM64 when intrinsic is fixed
+#if defined(ARCH_ARM_USE_INTRINSICS) && !defined(ARCH_ARM64_USE_INTRINSICS)
if((x2 > x1) && gArchUseSIMD) {
int32_t len = x2 - x1;
if (cstep == 1) {
@@ -224,5 +225,3 @@ RsdCpuScriptImpl * rsdIntrinsic_YuvToRGB(RsdCpuReferenceImpl *ctx,
const Script *s, const Element *e) {
return new RsdCpuScriptIntrinsicYuvToRGB(ctx, s, e);
}
-
-