From 64e89a8aff9a45a491f1d7064a655b9021fe644a Mon Sep 17 00:00:00 2001 From: Fred Quintana Date: Tue, 11 Aug 2009 20:49:35 -0700 Subject: [PATCH] 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." This reverts commit 8b76a0ac6fbf07254629ed1ea86af014d5abe050. --- include/ui/FramebufferNativeWindow.h | 1 - include/ui/ISurface.h | 2 +- include/ui/Surface.h | 5 +--- include/ui/egl/android_natives.h | 43 ++-------------------------- libs/surfaceflinger/Layer.cpp | 8 +++--- libs/surfaceflinger/Layer.h | 4 +-- libs/surfaceflinger/LayerBase.cpp | 2 +- libs/surfaceflinger/LayerBase.h | 2 +- libs/surfaceflinger/LayerBitmap.cpp | 24 ++++++++++------ libs/surfaceflinger/LayerBitmap.h | 7 ++--- libs/surfaceflinger/LayerBuffer.cpp | 6 +--- libs/surfaceflinger/LayerDim.cpp | 7 +---- libs/ui/FramebufferNativeWindow.cpp | 13 --------- libs/ui/ISurface.cpp | 6 ++-- libs/ui/Surface.cpp | 37 ++---------------------- opengl/libagl/egl.cpp | 4 --- 16 files changed, 37 insertions(+), 134 deletions(-) diff --git a/include/ui/FramebufferNativeWindow.h b/include/ui/FramebufferNativeWindow.h index 68144b5944a53..cb9bf940e23ae 100644 --- a/include/ui/FramebufferNativeWindow.h +++ b/include/ui/FramebufferNativeWindow.h @@ -63,7 +63,6 @@ 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, ...); framebuffer_device_t* fbDev; alloc_device_t* grDev; diff --git a/include/ui/ISurface.h b/include/ui/ISurface.h index 7909c2f41d4a8..adba45a48cb43 100644 --- a/include/ui/ISurface.h +++ b/include/ui/ISurface.h @@ -50,7 +50,7 @@ protected: public: DECLARE_META_INTERFACE(Surface); - virtual sp getBuffer(int usage) = 0; + virtual sp getBuffer() = 0; class BufferHeap { public: diff --git a/include/ui/Surface.h b/include/ui/Surface.h index 4ff0e4abd807d..d5dad31d00b6f 100644 --- a/include/ui/Surface.h +++ b/include/ui/Surface.h @@ -184,7 +184,7 @@ private: friend class IOMX; const sp& 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* buffer); status_t lockBuffer(const sp& 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; diff --git a/include/ui/egl/android_natives.h b/include/ui/egl/android_natives.h index 4c58e474c67d0..7da69b144a49e 100644 --- a/include/ui/egl/android_natives.h +++ b/include/ui/egl/android_natives.h @@ -67,11 +67,6 @@ enum { NATIVE_WINDOW_FORMAT = 2, }; -/* valid operations for the (*perform)() hook */ -enum { - NATIVE_WINDOW_SET_USAGE = 0 -}; - struct android_native_window_t { #ifdef __cplusplus @@ -147,45 +142,11 @@ struct android_native_window_t * Returns 0 on success or -errno on error. */ int (*query)(struct android_native_window_t* window, - int what, int* value); + int what, int* value); - /* - * hook used to perform various operations on the surface. - * (*perform)() is a generic mechanism to add functionality to - * android_native_window_t while keeping backward binary compatibility. - * - * This hook should not be called directly, instead use the helper functions - * defined below. - * - * The valid operations are: - * NATIVE_WINDOW_SET_USAGE - * - */ - - int (*perform)(struct android_native_window_t* window, - int operation, ... ); - - void* reserved_proc[3]; + void* reserved_proc[4]; }; - -/* - * native_window_set_usage() sets the intended usage flags for the next - * buffers acquired with (*lockBuffer)() and on. - * By default (if this function is never called), a usage of - * GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_TEXTURE - * is assumed. - * Calling this function will usually cause following buffers to be - * reallocated. - */ - -inline int native_window_set_usage( - struct android_native_window_t* window, int usage) -{ - return window->perform(window, NATIVE_WINDOW_SET_USAGE, usage); -} - - // --------------------------------------------------------------------------- /* FIXME: this is legacy for pixmaps */ diff --git a/libs/surfaceflinger/Layer.cpp b/libs/surfaceflinger/Layer.cpp index 8c0b40d9e4712..d1142cca86da6 100644 --- a/libs/surfaceflinger/Layer.cpp +++ b/libs/surfaceflinger/Layer.cpp @@ -217,7 +217,7 @@ void Layer::onDraw(const Region& clip) const drawWithOpenGL(clip, mTextures[index]); } -sp Layer::peekBuffer(int usage) +sp Layer::peekBuffer() { /* * This is called from the client's Surface::lock(), after it locked @@ -250,7 +250,7 @@ sp Layer::peekBuffer(int usage) } LayerBitmap& layerBitmap(mBuffers[backBufferIndex]); - sp buffer = layerBitmap.allocate(usage); + sp buffer = layerBitmap.allocate(); LOGD_IF(DEBUG_RESIZE, "Layer::getBuffer(this=%p), index=%d, (%d,%d), (%d,%d)", @@ -649,12 +649,12 @@ Layer::SurfaceLayer::~SurfaceLayer() { } -sp Layer::SurfaceLayer::getBuffer(int usage) +sp Layer::SurfaceLayer::getBuffer() { sp buffer = 0; sp owner(getOwner()); if (owner != 0) { - buffer = owner->peekBuffer(usage); + buffer = owner->peekBuffer(); } return buffer; } diff --git a/libs/surfaceflinger/Layer.h b/libs/surfaceflinger/Layer.h index add5d50747418..4c13d6ea2887c 100644 --- a/libs/surfaceflinger/Layer.h +++ b/libs/surfaceflinger/Layer.h @@ -101,7 +101,7 @@ private: status_t resize(int32_t index, uint32_t w, uint32_t h, const char* what); Region post(uint32_t* oldState, bool& recomputeVisibleRegions); - sp peekBuffer(int usage); + sp peekBuffer(); void destroy(); void scheduleBroadcast(); @@ -114,7 +114,7 @@ private: ~SurfaceLayer(); private: - virtual sp getBuffer(int usage); + virtual sp getBuffer(); sp getOwner() const { return static_cast(Surface::getOwner().get()); diff --git a/libs/surfaceflinger/LayerBase.cpp b/libs/surfaceflinger/LayerBase.cpp index 419574c7def1c..fbce73ddd3be7 100644 --- a/libs/surfaceflinger/LayerBase.cpp +++ b/libs/surfaceflinger/LayerBase.cpp @@ -759,7 +759,7 @@ status_t LayerBaseClient::Surface::onTransact( return BnSurface::onTransact(code, data, reply, flags); } -sp LayerBaseClient::Surface::getBuffer(int) +sp LayerBaseClient::Surface::getBuffer() { return NULL; } diff --git a/libs/surfaceflinger/LayerBase.h b/libs/surfaceflinger/LayerBase.h index 65bf55b51b42d..6fb1d1c50cabf 100644 --- a/libs/surfaceflinger/LayerBase.h +++ b/libs/surfaceflinger/LayerBase.h @@ -335,7 +335,7 @@ public: sp getOwner() const; private: - virtual sp getBuffer(int usage); + virtual sp getBuffer(); virtual status_t registerBuffers(const ISurface::BufferHeap& buffers); virtual void postBuffer(ssize_t offset); virtual void unregisterBuffers(); diff --git a/libs/surfaceflinger/LayerBitmap.cpp b/libs/surfaceflinger/LayerBitmap.cpp index 5e74451d5f04a..5221fed56f4db 100644 --- a/libs/surfaceflinger/LayerBitmap.cpp +++ b/libs/surfaceflinger/LayerBitmap.cpp @@ -38,14 +38,13 @@ namespace android { // Buffer and implementation of android_native_buffer_t // =========================================================================== -Buffer::Buffer(uint32_t w, uint32_t h, PixelFormat format, - uint32_t reqUsage, uint32_t flags) +Buffer::Buffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t flags) : SurfaceBuffer(), mInitCheck(NO_INIT), mFlags(flags), mVStride(0) { this->format = format; if (w>0 && h>0) { - mInitCheck = initSize(w, h, reqUsage); + mInitCheck = initSize(w, h); } } @@ -66,7 +65,7 @@ android_native_buffer_t* Buffer::getNativeBuffer() const return static_cast(const_cast(this)); } -status_t Buffer::initSize(uint32_t w, uint32_t h, uint32_t reqUsage) +status_t Buffer::initSize(uint32_t w, uint32_t h) { status_t err = NO_ERROR; @@ -89,9 +88,16 @@ status_t Buffer::initSize(uint32_t w, uint32_t h, uint32_t reqUsage) usage = BufferAllocator::USAGE_SW_READ_OFTEN | BufferAllocator::USAGE_SW_WRITE_OFTEN; } else { - // it's allowed to modify the usage flags here, but generally - // the requested flags should be honored. - usage = reqUsage | BufferAllocator::USAGE_HW_TEXTURE; + if (mFlags & Buffer::GPU) { + // the client wants to do GL rendering + usage = BufferAllocator::USAGE_HW_RENDER | + BufferAllocator::USAGE_HW_TEXTURE; + } else { + // software rendering-client, h/w composition + usage = BufferAllocator::USAGE_SW_READ_OFTEN | + BufferAllocator::USAGE_SW_WRITE_OFTEN | + BufferAllocator::USAGE_HW_TEXTURE; + } } err = allocator.alloc(w, h, format, usage, &handle, &stride); @@ -168,12 +174,12 @@ status_t LayerBitmap::setSize(uint32_t w, uint32_t h) return NO_ERROR; } -sp LayerBitmap::allocate(uint32_t reqUsage) +sp LayerBitmap::allocate() { Mutex::Autolock _l(mLock); surface_info_t* info = mInfo; mBuffer.clear(); // free buffer before allocating a new one - sp buffer = new Buffer(mWidth, mHeight, mFormat, reqUsage, mFlags); + sp buffer = new Buffer(mWidth, mHeight, mFormat, mFlags); status_t err = buffer->initCheck(); if (LIKELY(err == NO_ERROR)) { info->flags = surface_info_t::eBufferDirty; diff --git a/libs/surfaceflinger/LayerBitmap.h b/libs/surfaceflinger/LayerBitmap.h index 48ee553e523ac..22525cebdfc51 100644 --- a/libs/surfaceflinger/LayerBitmap.h +++ b/libs/surfaceflinger/LayerBitmap.h @@ -58,8 +58,7 @@ public: }; // creates w * h buffer - Buffer(uint32_t w, uint32_t h, PixelFormat format, - uint32_t reqUsage, uint32_t flags = 0); + Buffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t flags = 0); // return status status_t initCheck() const; @@ -82,7 +81,7 @@ private: Buffer& operator = (const Buffer& rhs); const Buffer& operator = (const Buffer& rhs) const; - status_t initSize(uint32_t w, uint32_t h, uint32_t reqUsage); + status_t initSize(uint32_t w, uint32_t h); ssize_t mInitCheck; uint32_t mFlags; @@ -109,7 +108,7 @@ public: status_t setSize(uint32_t w, uint32_t h); - sp allocate(uint32_t reqUsage); + sp allocate(); status_t free(); sp getBuffer() const { return mBuffer; } diff --git a/libs/surfaceflinger/LayerBuffer.cpp b/libs/surfaceflinger/LayerBuffer.cpp index e1f4bea228c54..90e7f50480677 100644 --- a/libs/surfaceflinger/LayerBuffer.cpp +++ b/libs/surfaceflinger/LayerBuffer.cpp @@ -28,7 +28,6 @@ #include -#include "BufferAllocator.h" #include "LayerBuffer.h" #include "SurfaceFlinger.h" #include "DisplayHardware/DisplayHardware.h" @@ -465,10 +464,7 @@ void LayerBuffer::BufferSource::onDraw(const Region& clip) const mTempBitmap->getWidth() < tmp_w || mTempBitmap->getHeight() < tmp_h) { mTempBitmap.clear(); - mTempBitmap = new android::Buffer( - tmp_w, tmp_h, src.img.format, - BufferAllocator::USAGE_HW_TEXTURE | - BufferAllocator::USAGE_HW_2D); + mTempBitmap = new android::Buffer(tmp_w, tmp_h, src.img.format); err = mTempBitmap->initCheck(); } diff --git a/libs/surfaceflinger/LayerDim.cpp b/libs/surfaceflinger/LayerDim.cpp index 6ebb49f64ca24..8e9df9cc9bcc3 100644 --- a/libs/surfaceflinger/LayerDim.cpp +++ b/libs/surfaceflinger/LayerDim.cpp @@ -21,7 +21,6 @@ #include #include -#include "BufferAllocator.h" #include "LayerDim.h" #include "SurfaceFlinger.h" #include "DisplayHardware/DisplayHardware.h" @@ -69,11 +68,7 @@ void LayerDim::initDimmer(SurfaceFlinger* flinger, uint32_t w, uint32_t h) if (LIKELY(flags & DisplayHardware::DIRECT_TEXTURE)) { // TODO: api to pass the usage flags - sp buffer = new Buffer(w, h, PIXEL_FORMAT_RGB_565, - BufferAllocator::USAGE_SW_WRITE_OFTEN | - BufferAllocator::USAGE_HW_TEXTURE | - BufferAllocator::USAGE_HW_2D); - + sp buffer = new Buffer(w, h, PIXEL_FORMAT_RGB_565); android_native_buffer_t* clientBuf = buffer->getNativeBuffer(); glGenTextures(1, &sTexId); diff --git a/libs/ui/FramebufferNativeWindow.cpp b/libs/ui/FramebufferNativeWindow.cpp index 90b51634c60cf..f6c666df4263f 100644 --- a/libs/ui/FramebufferNativeWindow.cpp +++ b/libs/ui/FramebufferNativeWindow.cpp @@ -132,7 +132,6 @@ FramebufferNativeWindow::FramebufferNativeWindow() android_native_window_t::lockBuffer = lockBuffer; android_native_window_t::queueBuffer = queueBuffer; android_native_window_t::query = query; - android_native_window_t::perform = perform; } FramebufferNativeWindow::~FramebufferNativeWindow() @@ -236,18 +235,6 @@ int FramebufferNativeWindow::query(android_native_window_t* window, return BAD_VALUE; } -int FramebufferNativeWindow::perform(android_native_window_t* window, - int operation, ...) -{ - switch (operation) { - case NATIVE_WINDOW_SET_USAGE: - break; - default: - return NAME_NOT_FOUND; - } - return NO_ERROR; -} - // ---------------------------------------------------------------------------- }; // namespace android // ---------------------------------------------------------------------------- diff --git a/libs/ui/ISurface.cpp b/libs/ui/ISurface.cpp index b78e8b5ab5a14..9fbae1ebafe19 100644 --- a/libs/ui/ISurface.cpp +++ b/libs/ui/ISurface.cpp @@ -71,11 +71,10 @@ public: { } - virtual sp getBuffer(int usage) + virtual sp getBuffer() { Parcel data, reply; data.writeInterfaceToken(ISurface::getInterfaceDescriptor()); - data.writeInt32(usage); remote()->transact(GET_BUFFER, data, &reply); sp buffer = new SurfaceBuffer(reply); return buffer; @@ -136,8 +135,7 @@ status_t BnSurface::onTransact( switch(code) { case GET_BUFFER: { CHECK_INTERFACE(ISurface, data, reply); - int usage = data.readInt32(); - sp buffer(getBuffer(usage)); + sp buffer(getBuffer()); return SurfaceBuffer::writeToParcel(reply, buffer.get()); } case REGISTER_BUFFERS: { diff --git a/libs/ui/Surface.cpp b/libs/ui/Surface.cpp index 2b6905f33fc25..4abb7f62ad443 100644 --- a/libs/ui/Surface.cpp +++ b/libs/ui/Surface.cpp @@ -414,7 +414,6 @@ void Surface::init() android_native_window_t::lockBuffer = lockBuffer; android_native_window_t::queueBuffer = queueBuffer; android_native_window_t::query = query; - android_native_window_t::perform = perform; mSwapRectangle.makeInvalid(); DisplayInfo dinfo; SurfaceComposerClient::getDisplayInfo(0, &dinfo); @@ -424,8 +423,6 @@ void Surface::init() const_cast(android_native_window_t::minSwapInterval) = 1; const_cast(android_native_window_t::maxSwapInterval) = 1; const_cast(android_native_window_t::flags) = 0; - // be default we request a hardware surface - mUsage = GRALLOC_USAGE_HW_RENDER; } @@ -515,17 +512,6 @@ int Surface::query(android_native_window_t* window, return self->query(what, value); } -int Surface::perform(android_native_window_t* window, - int operation, ...) -{ - va_list args; - va_start(args, operation); - Surface* self = getSelf(window); - int res = self->perform(operation, args); - va_end(args); - return res; -} - // ---------------------------------------------------------------------------- status_t Surface::dequeueBuffer(sp* buffer) @@ -575,7 +561,7 @@ int Surface::dequeueBuffer(android_native_buffer_t** buffer) volatile const surface_info_t* const back = lcblk->surface + backIdx; if (back->flags & surface_info_t::eNeedNewBuffer) { - err = getBufferLocked(backIdx, mUsage); + err = getBufferLocked(backIdx); } if (err == NO_ERROR) { @@ -641,20 +627,6 @@ int Surface::query(int what, int* value) return BAD_VALUE; } -int Surface::perform(int operation, va_list args) -{ - int res = NO_ERROR; - switch (operation) { - case NATIVE_WINDOW_SET_USAGE: - mUsage = va_arg(args, int); - break; - default: - res = NAME_NOT_FOUND; - break; - } - return res; -} - // ---------------------------------------------------------------------------- status_t Surface::lock(SurfaceInfo* info, bool blocking) { @@ -664,9 +636,6 @@ status_t Surface::lock(SurfaceInfo* info, bool blocking) { status_t Surface::lock(SurfaceInfo* other, Region* dirtyIn, bool blocking) { // FIXME: needs some locking here - - // we're intending to do software rendering from this point - mUsage = GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN; sp backBuffer; status_t err = dequeueBuffer(&backBuffer); @@ -756,10 +725,10 @@ void Surface::setSwapRectangle(const Rect& r) { mSwapRectangle = r; } -status_t Surface::getBufferLocked(int index, int usage) +status_t Surface::getBufferLocked(int index) { status_t err = NO_MEMORY; - sp buffer = mSurface->getBuffer(usage); + sp buffer = mSurface->getBuffer(); LOGE_IF(buffer==0, "ISurface::getBuffer() returned NULL"); if (buffer != 0) { sp& currentBuffer(mBuffers[index]); diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index 0762ebf605fcc..cf66be33729fe 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -384,10 +384,6 @@ egl_window_surface_v2_t::~egl_window_surface_v2_t() { EGLBoolean egl_window_surface_v2_t::connect() { - // we're intending to do software rendering - native_window_set_usage(nativeWindow, - GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN); - // dequeue a buffer if (nativeWindow->dequeueBuffer(nativeWindow, &buffer) != NO_ERROR) { return setError(EGL_BAD_ALLOC, EGL_FALSE);