diff options
| author | Dan Stoza <stoza@google.com> | 2015-03-11 11:55:01 -0700 |
|---|---|---|
| committer | Dan Stoza <stoza@google.com> | 2015-04-02 13:35:45 -0700 |
| commit | 231832eb27107fb561467f5f4a9be2c577c61ea8 (patch) | |
| tree | ab56a97f7ed1dbe951e09c082dee605d836362ba /include/gui | |
| parent | 23b204e1ee9069b9321b5547e8d17a5014efbacd (diff) | |
| download | frameworks_native-231832eb27107fb561467f5f4a9be2c577c61ea8.zip frameworks_native-231832eb27107fb561467f5f4a9be2c577c61ea8.tar.gz frameworks_native-231832eb27107fb561467f5f4a9be2c577c61ea8.tar.bz2 | |
DO NOT MERGE libgui: Plumb attach/detach through Surface
Exposes the attachBuffer and detachNextBuffer calls from
IGraphicBufferProducer to the public Surface interface. Also moves
the version of connect that takes a producer callback from protected
to public.
Bug: 19628705
Change-Id: I9ebc3013c4d9c84c4e8ef150c00e03f8af80319e
(cherry picked from commit c14ecb9de243af8864610fd3c74342e3ca2cb4bc)
Diffstat (limited to 'include/gui')
| -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 }; |