diff options
| author | Miao Wang <miaowang@google.com> | 2015-02-05 02:31:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-05 02:31:24 +0000 |
| commit | 0ab7ef4004daed0ea43d5b9d2ee87517d4168a17 (patch) | |
| tree | b0c84d745a4db74e3ab4cabe9300a78eb5d4a8d8 /cpp | |
| parent | 28e2a30f118a52d87399bf1a961f3ea4f440fce8 (diff) | |
| parent | caa8bd8b8a43d4cecbc391651fc90b3a2147957e (diff) | |
| download | rs-0ab7ef4004daed0ea43d5b9d2ee87517d4168a17.tar.gz | |
am caa8bd8b: Merge "Add the missing \'stridelen\' field for AllocationGetPointer."
* commit 'caa8bd8b8a43d4cecbc391651fc90b3a2147957e':
Add the missing 'stridelen' field for AllocationGetPointer.
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/Allocation.cpp | 2 | ||||
| -rw-r--r-- | cpp/rsDispatch.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/Allocation.cpp b/cpp/Allocation.cpp index 50ae2394..c4d62b5f 100644 --- a/cpp/Allocation.cpp +++ b/cpp/Allocation.cpp @@ -183,7 +183,7 @@ void * Allocation::getPointer(size_t *stride) { } p = RS::dispatch->AllocationGetPointer(mRS->getContext(), getIDSafe(), 0, - RS_ALLOCATION_CUBEMAP_FACE_POSITIVE_X, 0, 0, stride); + RS_ALLOCATION_CUBEMAP_FACE_POSITIVE_X, 0, 0, stride, sizeof(size_t)); if (mRS->getError() != RS_SUCCESS) { mRS->throwError(RS_ERROR_RUNTIME_ERROR, "Allocation lock failed"); p = nullptr; diff --git a/cpp/rsDispatch.h b/cpp/rsDispatch.h index a70e9deb..0d6d29f8 100644 --- a/cpp/rsDispatch.h +++ b/cpp/rsDispatch.h @@ -90,7 +90,7 @@ typedef void (*ScriptGroupSetInputFnPtr) (RsContext, RsScriptGroup, RsScriptKern typedef void (*ScriptGroupExecuteFnPtr) (RsContext, RsScriptGroup); typedef void (*AllocationIoSendFnPtr) (RsContext, RsAllocation); typedef void (*AllocationIoReceiveFnPtr) (RsContext, RsAllocation); -typedef void * (*AllocationGetPointerFnPtr) (RsContext, RsAllocation, uint32_t lod, RsAllocationCubemapFace face, uint32_t z, uint32_t array, size_t *stride); +typedef void * (*AllocationGetPointerFnPtr) (RsContext, RsAllocation, uint32_t lod, RsAllocationCubemapFace face, uint32_t z, uint32_t array, size_t *stride, size_t stride_len); struct dispatchTable { SetNativeLibDirFnPtr SetNativeLibDir; |