diff options
| author | Stephen Hines <srhines@google.com> | 2014-07-25 12:41:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-25 12:41:15 +0000 |
| commit | cfd173917c39e172ed84be26dce229bc8b5cccbb (patch) | |
| tree | 845b7cd9d66b9e11bb93b5cc2380bb22c167e21d /cpu_ref/rsCpuIntrinsicResize.cpp | |
| parent | f151f3b16a681d9f6c3edf85ad221c3c048985dd (diff) | |
| parent | 28c8f3a8f4e92ef9956c5a01f09347eff1e59417 (diff) | |
am 28c8f3a8: Merge "Split the RsForEachStubParamStruct in two."
* commit '28c8f3a8f4e92ef9956c5a01f09347eff1e59417':
Split the RsForEachStubParamStruct in two.
Diffstat (limited to 'cpu_ref/rsCpuIntrinsicResize.cpp')
| -rw-r--r-- | cpu_ref/rsCpuIntrinsicResize.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpu_ref/rsCpuIntrinsicResize.cpp b/cpu_ref/rsCpuIntrinsicResize.cpp index 474f82d1..9e54aa16 100644 --- a/cpu_ref/rsCpuIntrinsicResize.cpp +++ b/cpu_ref/rsCpuIntrinsicResize.cpp @@ -46,13 +46,13 @@ protected: ObjectBaseRef<const Allocation> mAlloc; ObjectBaseRef<const Element> mElement; - static void kernelU1(const RsForEachStubParamStruct *p, + static void kernelU1(const RsExpandKernelParams *p, uint32_t xstart, uint32_t xend, uint32_t instep, uint32_t outstep); - static void kernelU2(const RsForEachStubParamStruct *p, + static void kernelU2(const RsExpandKernelParams *p, uint32_t xstart, uint32_t xend, uint32_t instep, uint32_t outstep); - static void kernelU4(const RsForEachStubParamStruct *p, + static void kernelU4(const RsExpandKernelParams *p, uint32_t xstart, uint32_t xend, uint32_t instep, uint32_t outstep); }; @@ -175,7 +175,7 @@ static uchar OneBiCubic(const uchar *yp0, const uchar *yp1, const uchar *yp2, co return (uchar)p; } -void RsdCpuScriptIntrinsicResize::kernelU4(const RsForEachStubParamStruct *p, +void RsdCpuScriptIntrinsicResize::kernelU4(const RsExpandKernelParams *p, uint32_t xstart, uint32_t xend, uint32_t instep, uint32_t outstep) { RsdCpuScriptIntrinsicResize *cp = (RsdCpuScriptIntrinsicResize *)p->usr; @@ -215,7 +215,7 @@ void RsdCpuScriptIntrinsicResize::kernelU4(const RsForEachStubParamStruct *p, } } -void RsdCpuScriptIntrinsicResize::kernelU2(const RsForEachStubParamStruct *p, +void RsdCpuScriptIntrinsicResize::kernelU2(const RsExpandKernelParams *p, uint32_t xstart, uint32_t xend, uint32_t instep, uint32_t outstep) { RsdCpuScriptIntrinsicResize *cp = (RsdCpuScriptIntrinsicResize *)p->usr; @@ -255,7 +255,7 @@ void RsdCpuScriptIntrinsicResize::kernelU2(const RsForEachStubParamStruct *p, } } -void RsdCpuScriptIntrinsicResize::kernelU1(const RsForEachStubParamStruct *p, +void RsdCpuScriptIntrinsicResize::kernelU1(const RsExpandKernelParams *p, uint32_t xstart, uint32_t xend, uint32_t instep, uint32_t outstep) { RsdCpuScriptIntrinsicResize *cp = (RsdCpuScriptIntrinsicResize *)p->usr; |