From fc7ab793ea2db91f330272d9470433bbb1a505ce Mon Sep 17 00:00:00 2001 From: David Gross Date: Wed, 1 Jun 2016 14:45:47 -0700 Subject: Delete simple reduction implementation. Bug: 27298560 Change-Id: I8c3d568e98aaf0b7d86881c985d13ed5b8e95338 (cherry picked from commit ae2ec3febedfc29376b9104413fb4042028f1265) --- rsScriptC.cpp | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) (limited to 'rsScriptC.cpp') diff --git a/rsScriptC.cpp b/rsScriptC.cpp index eaef8490..291fca2c 100644 --- a/rsScriptC.cpp +++ b/rsScriptC.cpp @@ -230,33 +230,13 @@ void ScriptC::runForEach(Context *rsc, } } -void ScriptC::runReduce(Context *rsc, uint32_t slot, const Allocation *ain, +void ScriptC::runReduce(Context *rsc, uint32_t slot, + const Allocation ** ains, size_t inLen, Allocation *aout, const RsScriptCall *sc) { - // TODO: Record the name of the kernel in the tracing information. - ATRACE_CALL(); - - if (slot >= mHal.info.exportedReduceCount) { - rsc->setError(RS_ERROR_BAD_SCRIPT, "The simple reduce kernel index is out of bounds"); - return; - } - if (mRSC->hadFatalError()) return; - - setupScript(rsc); - - if (rsc->props.mLogScripts) { - ALOGV("%p ScriptC::runReduce invoking slot %i, ptr %p", rsc, slot, this); - } - - rsc->mHal.funcs.script.invokeReduce(rsc, this, slot, ain, aout, sc); -} - -void ScriptC::runReduceNew(Context *rsc, uint32_t slot, - const Allocation ** ains, size_t inLen, - Allocation *aout, const RsScriptCall *sc) { // TODO: Record the name of the kernel in the tracing information. ATRACE_CALL(); - if (slot >= mHal.info.exportedReduceNewCount) { + if (slot >= mHal.info.exportedReduceCount) { rsc->setError(RS_ERROR_BAD_SCRIPT, "The general reduce kernel index is out of bounds"); return; } @@ -265,10 +245,10 @@ void ScriptC::runReduceNew(Context *rsc, uint32_t slot, setupScript(rsc); if (rsc->props.mLogScripts) { - ALOGV("%p ScriptC::runReduceNew invoking slot %i, ptr %p", rsc, slot, this); + ALOGV("%p ScriptC::runReduce invoking slot %i, ptr %p", rsc, slot, this); } - rsc->mHal.funcs.script.invokeReduceNew(rsc, this, slot, ains, inLen, aout, sc); + rsc->mHal.funcs.script.invokeReduce(rsc, this, slot, ains, inLen, aout, sc); } void ScriptC::Invoke(Context *rsc, uint32_t slot, const void *data, size_t len) { -- cgit v1.2.3