diff options
| author | 2009-08-11 20:50:32 -0700 | |
|---|---|---|
| committer | 2009-08-11 20:50:32 -0700 | |
| commit | efefd5efb9e20fbcd94c3f4766ca2a64e511da77 (patch) | |
| tree | 64b527b57b6e206497402e053e0b35a869a57915 /include/ui/Surface.h | |
| parent | d7fe92b85812c53079b813543d722922e4ce7a4a (diff) | |
| parent | 64e89a8aff9a45a491f1d7064a655b9021fe644a (diff) | |
Merge change 20892
* changes:
Revert "SurfaceFlinger will now allocate buffers based on the usage specified by the clients. This allows to allocate the right kind of buffer automatically, without having the user to specify anything."
Diffstat (limited to 'include/ui/Surface.h')
| -rw-r--r-- | include/ui/Surface.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/ui/Surface.h b/include/ui/Surface.h index 4ff0e4abd807..d5dad31d00b6 100644 --- a/include/ui/Surface.h +++ b/include/ui/Surface.h @@ -184,7 +184,7 @@ private: friend class IOMX; const sp<ISurface>& getISurface() const { return mSurface; } - status_t getBufferLocked(int index, int usage); + status_t getBufferLocked(int index); status_t validate(per_client_cblk_t const* cblk) const; static void _send_dirty_region(layer_cblk_t* lcblk, const Region& dirty); @@ -197,13 +197,11 @@ private: static int lockBuffer(android_native_window_t* window, android_native_buffer_t* buffer); static int queueBuffer(android_native_window_t* window, android_native_buffer_t* buffer); static int query(android_native_window_t* window, int what, int* value); - static int perform(android_native_window_t* window, int operation, ...); int dequeueBuffer(android_native_buffer_t** buffer); int lockBuffer(android_native_buffer_t* buffer); int queueBuffer(android_native_buffer_t* buffer); int query(int what, int* value); - int perform(int operation, va_list args); status_t dequeueBuffer(sp<SurfaceBuffer>* buffer); status_t lockBuffer(const sp<SurfaceBuffer>& buffer); @@ -219,7 +217,6 @@ private: uint32_t mIdentity; uint32_t mWidth; uint32_t mHeight; - uint32_t mUsage; PixelFormat mFormat; uint32_t mFlags; mutable Region mDirtyRegion; |