diff options
| author | David Gross <dgross@google.com> | 2016-06-01 14:45:47 -0700 |
|---|---|---|
| committer | David Gross <dgross@google.com> | 2016-06-10 10:45:29 -0700 |
| commit | ae2ec3febedfc29376b9104413fb4042028f1265 (patch) | |
| tree | 36d8f632058bc158f48b4e148bcf41c177802d1b /driver | |
| parent | 8e70791ff732ce244077310bdfdaf75dc19baabc (diff) | |
| download | rs-nougat-dev.tar.gz | |
Delete simple reduction implementation.nougat-dev
Bug: 27298560
Change-Id: I8c3d568e98aaf0b7d86881c985d13ed5b8e95338
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/rsdBcc.cpp | 13 | ||||
| -rw-r--r-- | driver/rsdBcc.h | 11 | ||||
| -rw-r--r-- | driver/rsdCore.cpp | 2 |
3 files changed, 4 insertions, 22 deletions
diff --git a/driver/rsdBcc.cpp b/driver/rsdBcc.cpp index af8d6adf..5aa1c949 100644 --- a/driver/rsdBcc.cpp +++ b/driver/rsdBcc.cpp @@ -126,20 +126,11 @@ void rsdScriptInvokeFunction(const Context *dc, Script *s, void rsdScriptInvokeReduce(const Context *dc, Script *s, uint32_t slot, - const Allocation *ain, + const Allocation ** ains, size_t inLen, Allocation *aout, const RsScriptCall *sc) { RsdCpuReference::CpuScript *cs = (RsdCpuReference::CpuScript *)s->mHal.drv; - cs->invokeReduce(slot, ain, aout, sc); -} - -void rsdScriptInvokeReduceNew(const Context *dc, Script *s, - uint32_t slot, - const Allocation ** ains, size_t inLen, - Allocation *aout, - const RsScriptCall *sc) { - RsdCpuReference::CpuScript *cs = (RsdCpuReference::CpuScript *)s->mHal.drv; - cs->invokeReduceNew(slot, ains, inLen, aout, sc); + cs->invokeReduce(slot, ains, inLen, aout, sc); } void rsdScriptSetGlobalVar(const Context *dc, const Script *s, diff --git a/driver/rsdBcc.h b/driver/rsdBcc.h index a2bf8be0..c79f445a 100644 --- a/driver/rsdBcc.h +++ b/driver/rsdBcc.h @@ -46,18 +46,11 @@ void rsdScriptInvokeForEach(const android::renderscript::Context *rsc, void rsdScriptInvokeReduce(const android::renderscript::Context *rsc, android::renderscript::Script *s, uint32_t slot, - const android::renderscript::Allocation *ain, + const android::renderscript::Allocation ** ains, + size_t inLen, android::renderscript::Allocation *aout, const RsScriptCall *sc); -void rsdScriptInvokeReduceNew(const android::renderscript::Context *rsc, - android::renderscript::Script *s, - uint32_t slot, - const android::renderscript::Allocation ** ains, - size_t inLen, - android::renderscript::Allocation *aout, - const RsScriptCall *sc); - void rsdScriptInvokeForEachMulti(const android::renderscript::Context *rsc, android::renderscript::Script *s, uint32_t slot, diff --git a/driver/rsdCore.cpp b/driver/rsdCore.cpp index 503da5af..a5e942a9 100644 --- a/driver/rsdCore.cpp +++ b/driver/rsdCore.cpp @@ -101,8 +101,6 @@ extern "C" bool rsdHalQueryHal(RsHalInitEnums entry, void **fnPtr) { fnPtr[0] = (void *)rsdScriptUpdateCachedObject; break; case RS_HAL_SCRIPT_INVOKE_REDUCE: fnPtr[0] = (void *)rsdScriptInvokeReduce; break; - case RS_HAL_SCRIPT_INVOKE_REDUCE_NEW: - fnPtr[0] = (void *)rsdScriptInvokeReduceNew; break; case RS_HAL_ALLOCATION_INIT: fnPtr[0] = (void *)rsdAllocationInit; break; |