commit eb0dfedaf861049858a365d56d67cc85bfcad3c3
author Jason Sams <rjsams@android.com> Wed Jul 27 14:10:53 2011 -0700
committer Jason Sams <rjsams@android.com> Wed Jul 27 14:10:53 2011 -0700
tree dc26346def6beb45b423ce586ff74421e9d557ec
parent c500e74d0848b721bf01cf0ab344a6adb035c312

Add const to matrix by vector multiply routines.
Cleanup ifdef for rsForEach.

Change-Id: Id0d053f5dc73fef7dffed57ed02e90340b6cb798

scriptc/rs_math.rsh

diff --git a/scriptc/rs_math.rsh b/scriptc/rs_math.rsh
index fb5c4f6..1d36cc6 100644
--- a/scriptc/rs_math.rsh
+++ b/scriptc/rs_math.rsh
@@ -249,7 +249,16 @@
     uint32_t arrayEnd;
 } rs_script_call_t;
 
-#if 1//(RS_VERSION >= 14)
+#if !defined(RS_VERSION) || (RS_VERSION < 14)
+extern void __attribute__((overloadable))
+    rsForEach(rs_script script, rs_allocation input,
+              rs_allocation output, const void * usrData,
+              const rs_script_call_t *);
+
+extern void __attribute__((overloadable))
+    rsForEach(rs_script script, rs_allocation input,
+              rs_allocation output, const void * usrData);
+#else
 extern void __attribute__((overloadable))
     rsForEach(rs_script script, rs_allocation input, rs_allocation output);
 
@@ -260,18 +269,8 @@
 extern void __attribute__((overloadable))
     rsForEach(rs_script script, rs_allocation input, rs_allocation output,
               const void * usrData, size_t usrDataLen, const rs_script_call_t *);
-#else
-extern void __attribute__((overloadable))
-    rsForEach(rs_script script, rs_allocation input,
-              rs_allocation output, const void * usrData,
-              const rs_script_call_t *);
 #endif
 
-// Move me once dependant changes are in.
-extern void __attribute__((overloadable))
-    rsForEach(rs_script script, rs_allocation input,
-              rs_allocation output, const void * usrData);
-
 
 /**
  * Atomic add one to the value at addr.