diff options
| author | Greg Hackmann <ghackmann@google.com> | 2014-05-12 18:18:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-12 18:18:47 +0000 |
| commit | f974bffb36a97d21432a504a741330c4f4245746 (patch) | |
| tree | dc22d216b6c07d603ade02d0e6b8fe4db1f25aa7 /include/ui | |
| parent | 2f3dca149a2bcae96f18e38f7ba99a95c3e1b08c (diff) | |
| parent | 38c9e1327a5b24267c3dab5293bc9d7ada6e9fc9 (diff) | |
| download | frameworks_native-f974bffb36a97d21432a504a741330c4f4245746.zip frameworks_native-f974bffb36a97d21432a504a741330c4f4245746.tar.gz frameworks_native-f974bffb36a97d21432a504a741330c4f4245746.tar.bz2 | |
am 38c9e132: am c1ffd351: am bd20e551: Merge "Use asynchronous lock/unlock API"
* commit '38c9e1327a5b24267c3dab5293bc9d7ada6e9fc9':
Use asynchronous lock/unlock API
Diffstat (limited to 'include/ui')
| -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); |