summaryrefslogtreecommitdiffstats
path: root/include/ui
diff options
context:
space:
mode:
authorFrancis Hart <fhart@nvidia.com>2014-04-01 15:30:53 +0300
committerGreg Hackmann <ghackmann@google.com>2014-05-02 13:28:14 -0700
commit378ef07760eda717367d9429428c42d54d54d9a7 (patch)
treea656f922b8f232d6e4d37a4371685e595d974446 /include/ui
parentcb079c899ac9d9c5ec90840249821f58c817406c (diff)
downloadframeworks_native-378ef07760eda717367d9429428c42d54d54d9a7.zip
frameworks_native-378ef07760eda717367d9429428c42d54d54d9a7.tar.gz
frameworks_native-378ef07760eda717367d9429428c42d54d54d9a7.tar.bz2
Use asynchronous lock/unlock API
The gralloc API now provides a way for using lock/unlock with the Android explicit synchronisation concept. This changes updates the GraphicBuffer class to also expose this functionality, and updates the Surface class to make use of in line with the dequeueBuffer/queueBuffer mechanism. This new behaviour is dependent on GRALLOC_MODULE_API_VERSION_0_3. If the local gralloc module does not support this then the existing synchronous lock/unlock mechanism will be used. Change-Id: I77daa1beb197b63b1c2f281b8414ac4ae4b5b03c
Diffstat (limited to 'include/ui')
-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);