diff options
| author | Greg Hackmann <ghackmann@google.com> | 2014-05-09 22:00:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 22:00:04 +0000 |
| commit | 2f3dca149a2bcae96f18e38f7ba99a95c3e1b08c (patch) | |
| tree | c42170cdac8e30c84813a2723fbb89689b7d2463 /include/ui | |
| parent | 02528cf6aaedbbfec55be57d33389e1c57d88245 (diff) | |
| parent | 9493d4924a59f14b698389386337a9c07a7ea3c4 (diff) | |
| download | frameworks_native-2f3dca149a2bcae96f18e38f7ba99a95c3e1b08c.zip frameworks_native-2f3dca149a2bcae96f18e38f7ba99a95c3e1b08c.tar.gz frameworks_native-2f3dca149a2bcae96f18e38f7ba99a95c3e1b08c.tar.bz2 | |
am 9493d492: am 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""
* commit '9493d4924a59f14b698389386337a9c07a7ea3c4':
Revert "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, 0 insertions, 13 deletions
diff --git a/include/ui/GraphicBuffer.h b/include/ui/GraphicBuffer.h index ddc4635..a92424c 100644 --- a/include/ui/GraphicBuffer.h +++ b/include/ui/GraphicBuffer.h @@ -98,11 +98,6 @@ 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 98fff0e..99d8723 100644 --- a/include/ui/GraphicBufferMapper.h +++ b/include/ui/GraphicBufferMapper.h @@ -49,14 +49,6 @@ 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); |