summaryrefslogtreecommitdiff
path: root/rsScriptC_Lib.cpp
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-08-13 17:32:43 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-08-12 19:57:35 +0000
commitcd8df40f07d88f896bea05ed06a20d1a4d5e9728 (patch)
treeb028521e6474ab22bc99571ead62e1e4f0cb2dc6 /rsScriptC_Lib.cpp
parentf2dd1651ea50bf176d5e6580cc0589f7a3e89995 (diff)
parent4b2bea3dc20865f3a198797702e19912a6a2171c (diff)
downloadrs-cd8df40f07d88f896bea05ed06a20d1a4d5e9728.tar.gz
Merge "Revert "Collapse code paths for single- and multi-input kernels.""
Diffstat (limited to 'rsScriptC_Lib.cpp')
-rw-r--r--rsScriptC_Lib.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/rsScriptC_Lib.cpp b/rsScriptC_Lib.cpp
index cacb37ad..a41f4a79 100644
--- a/rsScriptC_Lib.cpp
+++ b/rsScriptC_Lib.cpp
@@ -230,17 +230,7 @@ void rsrForEach(Context *rsc,
Allocation *in, Allocation *out,
const void *usr, uint32_t usrBytes,
const RsScriptCall *call) {
-
- if (in == NULL) {
- target->runForEach(rsc, /* root slot */ 0, NULL, 0, out, usr,
- usrBytes, call);
-
- } else {
- const Allocation *ins[1] = {in};
- target->runForEach(rsc, /* root slot */ 0, ins,
- sizeof(ins) / sizeof(RsAllocation), out, usr,
- usrBytes, call);
- }
+ target->runForEach(rsc, /* root slot */ 0, in, out, usr, usrBytes, call);
}
void rsrAllocationSyncAll(Context *rsc, Allocation *a, RsAllocationUsageType usage) {