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

am acdc44bb: Merge "fix a bug when reallocating a window\'s buffers is needed" into kraken

Browse Source
This commit is contained in:
Mathias Agopian
2010-05-24 18:31:59 -07:00
committed by Android Git Automerger
parent 49551ca41e acdc44bbba
commit 27d2f0caef
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/private/surfaceflinger/SharedBufferStack.h
View File

@@ -303,6 +303,7 @@ private:
: mCapacity(c), mList(0) { } : mCapacity(c), mList(0) { }
status_t add(int value); status_t add(int value);
status_t remove(int value); status_t remove(int value);
uint32_t getMask() const { return mList; }
class const_iterator { class const_iterator {
friend class BufferList; friend class BufferList;

4
libs/surfaceflinger_client/SharedBufferStack.cpp
View File

@@ -440,7 +440,7 @@ status_t SharedBufferClient::queue(int buf)
bool SharedBufferClient::needNewBuffer(int buf) const bool SharedBufferClient::needNewBuffer(int buf) const
{ {
SharedBufferStack& stack( *mSharedStack ); SharedBufferStack& stack( *mSharedStack );
const uint32_t mask = 1<<buf; const uint32_t mask = 1<<(31-buf);
return (android_atomic_and(~mask, &stack.reallocMask) & mask) != 0; return (android_atomic_and(~mask, &stack.reallocMask) & mask) != 0;
} }
@@ -532,7 +532,7 @@ status_t SharedBufferServer::reallocate()
RWLock::AutoRLock _l(mLock); RWLock::AutoRLock _l(mLock);
SharedBufferStack& stack( *mSharedStack ); SharedBufferStack& stack( *mSharedStack );
uint32_t mask = (1<<mNumBuffers)-1; uint32_t mask = mBufferList.getMask();
android_atomic_or(mask, &stack.reallocMask); android_atomic_or(mask, &stack.reallocMask);
return NO_ERROR; return NO_ERROR;
} }