Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am dd8f6186: Merge change 25201 into eclair

Browse Source 
Merge commit 'dd8f6186775f69a8fef6213bcdc23be633d1ab6f' into eclair-plus-aosp

* commit 'dd8f6186775f69a8fef6213bcdc23be633d1ab6f':
  Revert "fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer"
This commit is contained in:
Mathias Agopian
2009-09-15 19:02:24 -07:00
committed by Android Git Automerger
parent d071bbd7fb dd8f618677
commit d4e3265b1a
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/ui/Surface.h
View File

@@ -212,7 +212,7 @@ private:
void setUsage(uint32_t reqUsage); void setUsage(uint32_t reqUsage);
uint32_t getUsage() const; bool getUsage(uint32_t* usage);
// constants // constants
sp<SurfaceComposerClient> mClient; sp<SurfaceComposerClient> mClient;
@@ -227,6 +227,7 @@ private:
// protected by mSurfaceLock // protected by mSurfaceLock
Rect mSwapRectangle; Rect mSwapRectangle;
uint32_t mUsage; uint32_t mUsage;
int32_t mUsageChanged;
// protected by mSurfaceLock. These are also used from lock/unlock // protected by mSurfaceLock. These are also used from lock/unlock
// but in that case, they must be called form the same thread. // but in that case, they must be called form the same thread.

26
libs/ui/Surface.cpp
View File

@@ -361,6 +361,7 @@ void Surface::init()
const_cast<uint32_t&>(android_native_window_t::flags) = 0; const_cast<uint32_t&>(android_native_window_t::flags) = 0;
// be default we request a hardware surface // be default we request a hardware surface
mUsage = GRALLOC_USAGE_HW_RENDER; mUsage = GRALLOC_USAGE_HW_RENDER;
mUsageChanged = true;
mNeedFullUpdate = false; mNeedFullUpdate = false;
} }
@@ -498,12 +499,13 @@ int Surface::dequeueBuffer(android_native_buffer_t** buffer)
return bufIdx; return bufIdx;
} }
const uint32_t usage(getUsage()); // FIXME: in case of failure below, we need to undo the dequeue
uint32_t usage;
const bool usageChanged = getUsage(&usage);
const sp<SurfaceBuffer>& backBuffer(mBuffers[bufIdx]); const sp<SurfaceBuffer>& backBuffer(mBuffers[bufIdx]);
if (backBuffer == 0 || if ((backBuffer == 0) || usageChanged ||
uint32_t(backBuffer->usage) != usage || mSharedBufferClient->needNewBuffer(bufIdx)) {
mSharedBufferClient->needNewBuffer(bufIdx))
{
err = getBufferLocked(bufIdx, usage); err = getBufferLocked(bufIdx, usage);
LOGE_IF(err, "getBufferLocked(%ld, %08x) failed (%s)", LOGE_IF(err, "getBufferLocked(%ld, %08x) failed (%s)",
bufIdx, usage, strerror(-err)); bufIdx, usage, strerror(-err));
@@ -598,13 +600,21 @@ int Surface::perform(int operation, va_list args)
void Surface::setUsage(uint32_t reqUsage) void Surface::setUsage(uint32_t reqUsage)
{ {
Mutex::Autolock _l(mSurfaceLock); Mutex::Autolock _l(mSurfaceLock);
mUsage = reqUsage; if (mUsage != reqUsage) {
mUsageChanged = true;
mUsage = reqUsage;
}
} }
uint32_t Surface::getUsage() const bool Surface::getUsage(uint32_t* usage)
{ {
Mutex::Autolock _l(mSurfaceLock); Mutex::Autolock _l(mSurfaceLock);
return mUsage; *usage = mUsage;
if (mUsageChanged) {
mUsageChanged = false;
return true;
}
return false;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------