From 64e89a8aff9a45a491f1d7064a655b9021fe644a Mon Sep 17 00:00:00 2001 From: Fred Quintana Date: Tue, 11 Aug 2009 20:49:35 -0700 Subject: 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. --- 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 +------ 8 files changed, 28 insertions(+), 32 deletions(-) (limited to 'libs/surfaceflinger') diff --git a/libs/surfaceflinger/Layer.cpp b/libs/surfaceflinger/Layer.cpp index 8c0b40d9e471..d1142cca86da 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 add5d5074741..4c13d6ea2887 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 419574c7def1..fbce73ddd3be 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 65bf55b51b42..6fb1d1c50cab 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 5e74451d5f04..5221fed56f4d 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 48ee553e523a..22525cebdfc5 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 e1f4bea228c5..90e7f5048067 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 6ebb49f64ca2..8e9df9cc9bcc 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); -- cgit v1.2.3-59-g8ed1b