commit ae2ec3febedfc29376b9104413fb4042028f1265
author David Gross <dgross@google.com> Wed Jun 01 14:45:47 2016 -0700
committer David Gross <dgross@google.com> Fri Jun 10 10:45:29 2016 -0700
tree 36d8f632058bc158f48b4e148bcf41c177802d1b
parent 8e70791ff732ce244077310bdfdaf75dc19baabc

Delete simple reduction implementation.

Bug: 27298560
Change-Id: I8c3d568e98aaf0b7d86881c985d13ed5b8e95338

cpu_ref/rsCpuScript.h

diff --git a/cpu_ref/rsCpuScript.h b/cpu_ref/rsCpuScript.h
index 2909dab..94345bd 100644
--- a/cpu_ref/rsCpuScript.h
+++ b/cpu_ref/rsCpuScript.h
@@ -61,15 +61,10 @@
                        const RsScriptCall* sc) override;
 
     void invokeReduce(uint32_t slot,
-                      const Allocation* ain,
+                      const Allocation ** ains, uint32_t inLen,
                       Allocation* aout,
                       const RsScriptCall* sc) override;
 
-    void invokeReduceNew(uint32_t slot,
-                         const Allocation ** ains, uint32_t inLen,
-                         Allocation* aout,
-                         const RsScriptCall* sc) override;
-
     void invokeInit() override;
     void invokeFreeChildren() override;
 
@@ -94,17 +89,11 @@
 
     virtual void forEachKernelSetup(uint32_t slot, MTLaunchStructForEach *mtls);
 
-    // Build an MTLaunchStruct suitable for launching a simple reduce-style kernel.
-    bool reduceMtlsSetup(const Allocation *ain, const Allocation *aout,
-                         const RsScriptCall *sc, MTLaunchStructReduce *mtls);
-    // Finalize an MTLaunchStruct for launching a simple reduce-style kernel.
-    virtual void reduceKernelSetup(uint32_t slot, MTLaunchStructReduce *mtls);
-
     // Build an MTLaunchStruct suitable for launching a general reduce-style kernel.
-    bool reduceNewMtlsSetup(const Allocation ** ains, uint32_t inLen, const Allocation *aout,
-                            const RsScriptCall *sc, MTLaunchStructReduceNew *mtls);
+    bool reduceMtlsSetup(const Allocation ** ains, uint32_t inLen, const Allocation *aout,
+                         const RsScriptCall *sc, MTLaunchStructReduce *mtls);
     // Finalize an MTLaunchStruct for launching a general reduce-style kernel.
-    virtual void reduceNewKernelSetup(uint32_t slot, MTLaunchStructReduceNew *mtls);
+    virtual void reduceKernelSetup(uint32_t slot, MTLaunchStructReduce *mtls);
 
     const RsdCpuReference::CpuSymbol * lookupSymbolMath(const char *sym);
     static void * lookupRuntimeStub(void* pContext, char const* name);