commit b8f9fb12f2d879f8f83e8dda1f302741a124513d
author Shih-wei Liao <sliao@google.com> Sat Jun 30 11:28:25 2012 -0700
committer Shih-wei Liao <sliao@google.com> Fri Jul 13 03:05:11 2012 -0700
tree fe6ae7203a5ca58fa71ed3abf78732ff60211c6a
parent ed7fffbc0e3fe3c5dced1248f6be52b6c95b513b

Link against NEON version of libclcore.bc when possible.

Change-Id: I078f64a7e697bd7f0a65f3dc6f30ae017c4ad8b4

lib/RenderScript/RSScript.cpp

diff --git a/lib/RenderScript/RSScript.cpp b/lib/RenderScript/RSScript.cpp
index 9058ff9..50397dc 100644
--- a/lib/RenderScript/RSScript.cpp
+++ b/lib/RenderScript/RSScript.cpp
@@ -25,17 +25,27 @@
 bool RSScript::LinkRuntime(RSScript &pScript) {
   // Using the same context with the source in pScript.
   BCCContext &context = pScript.getSource().getContext();
-  Source *libclcore_source = Source::CreateFromFile(context,
-                                                    RSInfo::LibCLCorePath);
+  const char* core_lib = RSInfo::LibCLCorePath;
+
+  // NEON-capable devices can use an accelerated math library for all
+  // reduced precision scripts.
+#if defined(ARCH_ARM_HAVE_NEON)
+  const RSInfo* info = pScript.getInfo();
+  if ((info != NULL) &&
+      (info->getFloatPrecisionRequirement() != RSInfo::FP_Full)) {
+    core_lib = RSInfo::LibCLCoreNEONPath;
+  }
+#endif
+
+  Source *libclcore_source = Source::CreateFromFile(context, core_lib);
   if (libclcore_source == NULL) {
-    ALOGE("Failed to load Renderscript library '%s' to link!",
-          RSInfo::LibCLCorePath);
+    ALOGE("Failed to load Renderscript library '%s' to link!", core_lib);
     return false;
   }
 
   if (!pScript.getSource().merge(*libclcore_source,
                                  /* pPreserveSource */false)) {
-    ALOGE("Failed to link RenderScript library '%s'!", RSInfo::LibCLCorePath);
+    ALOGE("Failed to link RenderScript library '%s'!", core_lib);
     delete libclcore_source;
     return false;
   }