summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2014-05-12 18:08:13 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-12 18:08:13 +0000
commitc1ffd351bc44483369271c11dd4c6391bba8c64c (patch)
treeef3cf0d267c9d6951e15f6cdd6095ddc95b98fac /include
parent9eb142e34a5bc11508c0bd6f60ad3933c60aa530 (diff)
parentbd20e551f64234142e1146f9fa4b2dcebbd72122 (diff)
downloadframeworks_native-c1ffd351bc44483369271c11dd4c6391bba8c64c.zip
frameworks_native-c1ffd351bc44483369271c11dd4c6391bba8c64c.tar.gz
frameworks_native-c1ffd351bc44483369271c11dd4c6391bba8c64c.tar.bz2
am bd20e551: Merge "Use asynchronous lock/unlock API"
* commit 'bd20e551f64234142e1146f9fa4b2dcebbd72122': Use asynchronous lock/unlock API
Diffstat (limited to 'include')
-rw-r--r--include/ui/GraphicBuffer.h5
-rw-r--r--include/ui/GraphicBufferMapper.h8
2 files changed, 13 insertions, 0 deletions
diff --git a/include/ui/GraphicBuffer.h b/include/ui/GraphicBuffer.h
index 3cf628c..b973c40 100644
--- a/include/ui/GraphicBuffer.h
+++ b/include/ui/GraphicBuffer.h
@@ -97,6 +97,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);