commit dda5cb5b59ae02ec03001ea12c374413714f3d38
author Yang Ni <yangni@google.com> Tue Oct 27 15:23:17 2015 -0700
committer Yang Ni <yangni@google.com> Fri Nov 06 10:53:55 2015 -0800
tree bc1bb89402d520f3e219da7e490f5e51968c7005
parent 4a21e4dc4274dbf7d3ddad62e2cc1a9f25864a5f

Launch options & multi inputs for single-source RS

Bug: 23535985

Also renamed rsParallelFor to rsForEach, and deprecated previous
rsForEach.

Change-Id: Ibc22bd5e9585a4471b15920ef60fe1fe2312de49

rsScriptC_Lib.cpp

diff --git a/rsScriptC_Lib.cpp b/rsScriptC_Lib.cpp
index 9a9c57f..a411e34 100644
--- a/rsScriptC_Lib.cpp
+++ b/rsScriptC_Lib.cpp
@@ -237,20 +237,11 @@
 void rsrForEach(Context *rsc,
                 Script *target,
                 uint32_t slot,
-                Allocation *in, Allocation *out,
+                uint32_t numInputs,
+                Allocation **in, Allocation *out,
                 const void *usr, uint32_t usrBytes,
                 const RsScriptCall *call) {
-
-    if (in == nullptr) {
-        target->runForEach(rsc, slot, nullptr, 0, out, usr,
-                           usrBytes, call);
-
-    } else {
-        const Allocation *ins[1] = {in};
-        target->runForEach(rsc, slot, ins,
-                           sizeof(ins) / sizeof(RsAllocation), out, usr,
-                           usrBytes, call);
-    }
+    target->runForEach(rsc, slot, (const Allocation**)in, numInputs, out, usr, usrBytes, call);
 }
 
 void rsrAllocationSyncAll(Context *rsc, Allocation *a, RsAllocationUsageType usage) {