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

am 672ea584: Merge "fix [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken

Browse Source
This commit is contained in:
Mathias Agopian
2010-04-08 22:38:29 -07:00
committed by Android Git Automerger
parent eaec9f2e67 672ea584f5
commit 88235a5e9b
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libs/surfaceflinger_client/Surface.cpp
View File

@@ -495,9 +495,12 @@ int Surface::dequeueBuffer(android_native_buffer_t** buffer)
// below we make sure we AT LEAST have the usage flags we want // below we make sure we AT LEAST have the usage flags we want
const uint32_t usage(getUsage()); const uint32_t usage(getUsage());
const sp<GraphicBuffer>& backBuffer(mBuffers[bufIdx]); const sp<GraphicBuffer>& backBuffer(mBuffers[bufIdx]);
// Always call needNewBuffer(), since it clears the needed buffers flags
bool needNewBuffer = mSharedBufferClient->needNewBuffer(bufIdx);
if (backBuffer == 0 || if (backBuffer == 0 ||
((uint32_t(backBuffer->usage) & usage) != usage) || ((uint32_t(backBuffer->usage) & usage) != usage) ||
mSharedBufferClient->needNewBuffer(bufIdx)) needNewBuffer)
{ {
err = getBufferLocked(bufIdx, usage); err = getBufferLocked(bufIdx, usage);
LOGE_IF(err, "getBufferLocked(%ld, %08x) failed (%s)", LOGE_IF(err, "getBufferLocked(%ld, %08x) failed (%s)",
@@ -717,25 +720,25 @@ status_t Surface::lock(SurfaceInfo* other, Region* dirtyIn, bool blocking)
Region scratch(bounds); Region scratch(bounds);
Region& newDirtyRegion(dirtyIn ? *dirtyIn : scratch); Region& newDirtyRegion(dirtyIn ? *dirtyIn : scratch);
const Region copyback(mOldDirtyRegion.subtract(newDirtyRegion));
if (mNeedFullUpdate) { if (mNeedFullUpdate) {
// reset newDirtyRegion to bounds when a buffer is reallocated
// it would be better if this information was associated with
// the buffer and made available to outside of Surface.
// This will do for now though.
mNeedFullUpdate = false; mNeedFullUpdate = false;
newDirtyRegion.set(bounds); Region uninitialized(bounds);
} else { uninitialized.subtractSelf(copyback | newDirtyRegion);
newDirtyRegion.andSelf(bounds); // reset newDirtyRegion to bounds when a buffer is reallocated
// and we have nothing to copy back to it
if (!uninitialized.isEmpty())
newDirtyRegion.set(bounds);
} }
newDirtyRegion.andSelf(bounds);
const sp<GraphicBuffer>& frontBuffer(mPostedBuffer); const sp<GraphicBuffer>& frontBuffer(mPostedBuffer);
if (frontBuffer !=0 && if (frontBuffer != 0 &&
backBuffer->width == frontBuffer->width && backBuffer->width == frontBuffer->width &&
backBuffer->height == frontBuffer->height && backBuffer->height == frontBuffer->height &&
!(mFlags & ISurfaceComposer::eDestroyBackbuffer)) !(mFlags & ISurfaceComposer::eDestroyBackbuffer))
{ {
const Region copyback(mOldDirtyRegion.subtract(newDirtyRegion)); if (!copyback.isEmpty()) {
if (!copyback.isEmpty() && frontBuffer!=0) {
// copy front to back // copy front to back
copyBlt(backBuffer, frontBuffer, copyback); copyBlt(backBuffer, frontBuffer, copyback);
} }