summaryrefslogtreecommitdiff
path: root/rsScriptGroup.cpp
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-08-13 17:32:10 +0000
committerStephen Hines <srhines@google.com>2014-08-13 17:32:10 +0000
commit4b2bea3dc20865f3a198797702e19912a6a2171c (patch)
treeb028521e6474ab22bc99571ead62e1e4f0cb2dc6 /rsScriptGroup.cpp
parent818cfa034e257c7bb48356257f5cb67334e19aa6 (diff)
Revert "Collapse code paths for single- and multi-input kernels."
This reverts commit 818cfa034e257c7bb48356257f5cb67334e19aa6. Change-Id: I59f39f52e6c8f60bb01cbcb8ccf2215eaf46a57f
Diffstat (limited to 'rsScriptGroup.cpp')
-rw-r--r--rsScriptGroup.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/rsScriptGroup.cpp b/rsScriptGroup.cpp
index a03cb786..d1dd9d81 100644
--- a/rsScriptGroup.cpp
+++ b/rsScriptGroup.cpp
@@ -346,15 +346,7 @@ void ScriptGroup::execute(Context *rsc) {
}
}
- if (ain == NULL) {
- n->mScript->runForEach(rsc, k->mSlot, NULL, 0, aout, NULL, 0);
-
- } else {
- const Allocation *ains[1] = {ain};
- n->mScript->runForEach(rsc, k->mSlot, ains,
- sizeof(ains) / sizeof(RsAllocation),
- aout, NULL, 0);
- }
+ n->mScript->runForEach(rsc, k->mSlot, ain, aout, NULL, 0);
}
}
@@ -417,3 +409,4 @@ void rsi_ScriptGroupExecute(Context *rsc, RsScriptGroup sg) {
}
}
+