commit a54d515b456babf9a7dd2b561018c993de9b8d30
author Jason Sams <jsams@google.com> Fri Apr 12 02:19:53 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 12 02:19:53 2013 +0000
tree 290e9f5dc575d999fa952e48890d0d25f865b810
parent a66d000ed939eeb014f65f3ff6a7da06961aaeb6
parent 4961cceab2b71bf0ab59e1b66a7559f67ed28781

Merge "USAGE_IO notifications for new buffers." into jb-mr2-dev

cpu_ref/rsCpuScript.cpp

diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp
index ff1fd14..77ea75c 100644
--- a/cpu_ref/rsCpuScript.cpp
+++ b/cpu_ref/rsCpuScript.cpp
@@ -359,14 +359,12 @@
                 mForEachSignatures[i] = tmpSig;
                 mForEachFunctions[i] =
                         (ForEachFunc_t) dlsym(mScriptSO, tmpName);
-                if (mForEachFunctions[i] == NULL) {
-                    ALOGE("Failed to find forEach function address for %s: %s",
-                          tmpName, dlerror());
+                if (i != 0 && mForEachFunctions[i] == NULL) {
                     // Ignore missing root.expand functions.
                     // root() is always specified at location 0.
-                    if (i != 0) {
-                        goto error;
-                    }
+                    ALOGE("Failed to find forEach function address for %s: %s",
+                          tmpName, dlerror());
+                    goto error;
                 }
                 else {
                     //ALOGE("Found forEach %s at %p", tmpName, mForEachFunctions[i]);