diff options
| author | Chris Wailes <chriswailes@google.com> | 2014-07-16 15:18:30 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-08-12 17:02:01 -0700 |
| commit | 818cfa034e257c7bb48356257f5cb67334e19aa6 (patch) | |
| tree | 27ad9d05d771ae01aa678d71593a7c062b2d2105 /cpu_ref/rsCpuScript.h | |
| parent | fb0a274983ae8bfb07aff8c292305389789d6e92 (diff) | |
| download | rs-818cfa034e257c7bb48356257f5cb67334e19aa6.tar.gz | |
Collapse code paths for single- and multi-input kernels.
This patch simplifies the RenderScript driver and CPU reference implementation
by removing the distinction between sing- and multi-input kernels in many
places. The distinction is maintained in some places due to the need to
maintain backwards compatibility. This permits the deletion of some functions
and struct members that are no longer needed. Several related functions were
also cleaned up.
Change-Id: I77e4b155cc7ca1581b05bf901c70ae53a9ff0b12
Diffstat (limited to 'cpu_ref/rsCpuScript.h')
| -rw-r--r-- | cpu_ref/rsCpuScript.h | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/cpu_ref/rsCpuScript.h b/cpu_ref/rsCpuScript.h index d51e9e3f..f0843cc0 100644 --- a/cpu_ref/rsCpuScript.h +++ b/cpu_ref/rsCpuScript.h @@ -64,26 +64,22 @@ public: virtual void invokeFunction(uint32_t slot, const void *params, size_t paramLength); virtual int invokeRoot(); - virtual void preLaunch(uint32_t slot, const Allocation * ain, - Allocation * aout, const void * usr, + virtual void preLaunch(uint32_t slot, const Allocation ** ains, + uint32_t inLen, Allocation * aout, const void * usr, uint32_t usrLen, const RsScriptCall *sc); - virtual void postLaunch(uint32_t slot, const Allocation * ain, - Allocation * aout, const void * usr, - uint32_t usrLen, const RsScriptCall *sc); + virtual void postLaunch(uint32_t slot, const Allocation ** ains, + uint32_t inLen, Allocation * aout, + const void * usr, uint32_t usrLen, + const RsScriptCall *sc); + virtual void invokeForEach(uint32_t slot, - const Allocation * ain, - Allocation * aout, - const void * usr, - uint32_t usrLen, - const RsScriptCall *sc); - - virtual void invokeForEachMulti(uint32_t slot, - const Allocation** ains, - uint32_t inLen, - Allocation* aout, - const void* usr, - uint32_t usrLen, - const RsScriptCall* sc); + const Allocation ** ains, + uint32_t inLen, + Allocation* aout, + const void* usr, + uint32_t usrLen, + const RsScriptCall* sc); + virtual void invokeInit(); virtual void invokeFreeChildren(); @@ -100,10 +96,6 @@ public: const Script * getScript() {return mScript;} - void forEachMtlsSetup(const Allocation * ain, Allocation * aout, - const void * usr, uint32_t usrLen, - const RsScriptCall *sc, MTLaunchStruct *mtls); - void forEachMtlsSetup(const Allocation ** ains, uint32_t inLen, Allocation * aout, const void * usr, uint32_t usrLen, const RsScriptCall *sc, MTLaunchStruct *mtls); |