diff options
author | Greg Hackmann <ghackmann@google.com> | 2014-05-09 21:54:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 21:54:48 +0000 |
commit | 02528cf6aaedbbfec55be57d33389e1c57d88245 (patch) | |
tree | dc22d216b6c07d603ade02d0e6b8fe4db1f25aa7 /include | |
parent | 9f708e1094189825fd0e5b1157ad155964df92a5 (diff) | |
parent | 4b46776ff88c5a365700b88e8b2b04e1b2c77e6e (diff) | |
download | frameworks_native-02528cf6aaedbbfec55be57d33389e1c57d88245.zip frameworks_native-02528cf6aaedbbfec55be57d33389e1c57d88245.tar.gz frameworks_native-02528cf6aaedbbfec55be57d33389e1c57d88245.tar.bz2 |
am 4b46776f: am 8a6cd189: am f60564a1: Merge "Use asynchronous lock/unlock API"
* commit '4b46776ff88c5a365700b88e8b2b04e1b2c77e6e':
Use asynchronous lock/unlock API
Diffstat (limited to 'include')
-rw-r--r-- | include/ui/GraphicBuffer.h | 5 | ||||
-rw-r--r-- | include/ui/GraphicBufferMapper.h | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/ui/GraphicBuffer.h b/include/ui/GraphicBuffer.h index a92424c..ddc4635 100644 --- a/include/ui/GraphicBuffer.h +++ b/include/ui/GraphicBuffer.h @@ -98,6 +98,11 @@ public: status_t lockYCbCr(uint32_t usage, android_ycbcr *ycbcr); status_t lockYCbCr(uint32_t usage, const Rect& rect, android_ycbcr *ycbcr); status_t unlock(); + status_t lockAsync(uint32_t usage, void** vaddr, int fenceFd); + status_t lockAsync(uint32_t usage, const Rect& rect, void** vaddr, int fenceFd); + status_t lockAsyncYCbCr(uint32_t usage, android_ycbcr *ycbcr, int fenceFd); + status_t lockAsyncYCbCr(uint32_t usage, const Rect& rect, android_ycbcr *ycbcr, int fenceFd); + status_t unlockAsync(int *fenceFd); ANativeWindowBuffer* getNativeBuffer() const; diff --git a/include/ui/GraphicBufferMapper.h b/include/ui/GraphicBufferMapper.h index 99d8723..98fff0e 100644 --- a/include/ui/GraphicBufferMapper.h +++ b/include/ui/GraphicBufferMapper.h @@ -49,6 +49,14 @@ public: int usage, const Rect& bounds, android_ycbcr *ycbcr); status_t unlock(buffer_handle_t handle); + + status_t lockAsync(buffer_handle_t handle, + int usage, const Rect& bounds, void** vaddr, int fenceFd); + + status_t lockAsyncYCbCr(buffer_handle_t handle, + int usage, const Rect& bounds, android_ycbcr *ycbcr, int fenceFd); + + status_t unlockAsync(buffer_handle_t handle, int *fenceFd); // dumps information about the mapping of this handle void dump(buffer_handle_t handle); |