diff options
| author | Stephen Hines <srhines@google.com> | 2014-08-13 17:42:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-13 17:42:57 +0000 |
| commit | 385e32592394cf796d33102b8b7034ae81fdc13e (patch) | |
| tree | d719352983d942da2ad54be1eee9104726360070 /cpu_ref/rsCpuIntrinsicResize.cpp | |
| parent | 38f10a1eee245153b843dd78712ecaff6e89c412 (diff) | |
| parent | cd8df40f07d88f896bea05ed06a20d1a4d5e9728 (diff) | |
| download | rs-385e32592394cf796d33102b8b7034ae81fdc13e.tar.gz | |
am cd8df40f: Merge "Revert "Collapse code paths for single- and multi-input kernels.""
* commit 'cd8df40f07d88f896bea05ed06a20d1a4d5e9728':
Revert "Collapse code paths for single- and multi-input kernels."
Diffstat (limited to 'cpu_ref/rsCpuIntrinsicResize.cpp')
| -rw-r--r-- | cpu_ref/rsCpuIntrinsicResize.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpu_ref/rsCpuIntrinsicResize.cpp b/cpu_ref/rsCpuIntrinsicResize.cpp index f23ddd3f..9e54aa16 100644 --- a/cpu_ref/rsCpuIntrinsicResize.cpp +++ b/cpu_ref/rsCpuIntrinsicResize.cpp @@ -35,8 +35,8 @@ public: virtual ~RsdCpuScriptIntrinsicResize(); RsdCpuScriptIntrinsicResize(RsdCpuReferenceImpl *ctx, const Script *s, const Element *); - virtual void preLaunch(uint32_t slot, const Allocation ** ains, - uint32_t inLen, Allocation * aout, const void * usr, + virtual void preLaunch(uint32_t slot, const Allocation * ain, + Allocation * aout, const void * usr, uint32_t usrLen, const RsScriptCall *sc); float scaleX; @@ -304,11 +304,9 @@ RsdCpuScriptIntrinsicResize::RsdCpuScriptIntrinsicResize ( RsdCpuScriptIntrinsicResize::~RsdCpuScriptIntrinsicResize() { } -void RsdCpuScriptIntrinsicResize::preLaunch(uint32_t slot, - const Allocation ** ains, - uint32_t inLen, Allocation * aout, - const void * usr, uint32_t usrLen, - const RsScriptCall *sc) +void RsdCpuScriptIntrinsicResize::preLaunch(uint32_t slot, const Allocation * ain, + Allocation * aout, const void * usr, + uint32_t usrLen, const RsScriptCall *sc) { if (!mAlloc.get()) { ALOGE("Resize executed without input, skipping"); @@ -349,3 +347,5 @@ RsdCpuScriptImpl * rsdIntrinsic_Resize(RsdCpuReferenceImpl *ctx, const Script *s return new RsdCpuScriptIntrinsicResize(ctx, s, e); } + + |