diff options
| author | Dan Stoza <stoza@google.com> | 2015-04-07 22:00:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-07 22:03:29 +0000 |
| commit | a53e955ad882793bb6fea00d4d110a3d8878ab57 (patch) | |
| tree | a06b7fc1822d53c8891a27e39b5e27e50d873667 /include | |
| parent | e55cae86e6217a86d94bf280c6c8442bef2dd908 (diff) | |
| parent | 8ed81827565ff2294757d220b8390e88396cf506 (diff) | |
| download | frameworks_native-a53e955ad882793bb6fea00d4d110a3d8878ab57.zip frameworks_native-a53e955ad882793bb6fea00d4d110a3d8878ab57.tar.gz frameworks_native-a53e955ad882793bb6fea00d4d110a3d8878ab57.tar.bz2 | |
Merge "libgui: Plumb attach/detach through Surface" into stage-aosp-master
Diffstat (limited to 'include')
| -rw-r--r-- | include/gui/Surface.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/gui/Surface.h b/include/gui/Surface.h index 40e2fc1..e973483 100644 --- a/include/gui/Surface.h +++ b/include/gui/Surface.h @@ -158,7 +158,6 @@ protected: virtual int lockBuffer_DEPRECATED(ANativeWindowBuffer* buffer); - virtual int connect(int api, const sp<IProducerListener>& listener); virtual int connect(int api); virtual int disconnect(int api); virtual int setBufferCount(int bufferCount); @@ -177,6 +176,11 @@ public: virtual int lock(ANativeWindow_Buffer* outBuffer, ARect* inOutDirtyBounds); virtual int unlockAndPost(); + virtual int connect(int api, const sp<IProducerListener>& listener); + virtual int detachNextBuffer(ANativeWindowBuffer** outBuffer, + sp<Fence>* outFence); + virtual int attachBuffer(ANativeWindowBuffer*); + protected: enum { NUM_BUFFER_SLOTS = BufferQueue::NUM_BUFFER_SLOTS }; enum { DEFAULT_FORMAT = PIXEL_FORMAT_RGBA_8888 }; |