Merge changes from topic 'generalReductionDelete'

* changes:
  Delete simple reduction implementation.
  Add HAL version check, with fallback to CPU reference driver on failure.

1 files changed, 5 insertions, 25 deletions

diff --git a/rsScriptC.cpp b/rsScriptC.cpp
index 351aa4cd..fb808a6f 100644
--- a/rsScriptC.cpp
+++ b/rsScriptC.cpp
@@ -224,33 +224,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;
   }
@@ -259,10 +239,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) {