ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

am aa938c8d: Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0

Browse Source 
* commit 'aa938c8d9c0e71c9b556657cb33794210ce6ebf8':
  mDirtyRegion is single threaded, but could be accessed from a hwc thread
This commit is contained in:
Mathias Agopian 2011-10-21 16:00:00 -07:00 committed by Android Git Automerger
commit 51726c381e
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -742,6 +742,8 @@ void SurfaceFlinger::handlePageFlip()
}
unlockPageFlip(currentLayers);
mDirtyRegion.orSelf(getAndClearInvalidateRegion());
mDirtyRegion.andSelf(screenRegion);
}
@ -1716,12 +1718,24 @@ status_t SurfaceFlinger::onTransact(
}
void SurfaceFlinger::repaintEverything() {
Mutex::Autolock _l(mStateLock);
const DisplayHardware& hw(graphicPlane(0).displayHardware());
mDirtyRegion.set(hw.bounds());
const Rect bounds(hw.getBounds());
setInvalidateRegion(Region(bounds));
signalEvent();
}
void SurfaceFlinger::setInvalidateRegion(const Region& reg) {
Mutex::Autolock _l(mInvalidateLock);
mInvalidateRegion = reg;
}
Region SurfaceFlinger::getAndClearInvalidateRegion() {
Mutex::Autolock _l(mInvalidateLock);
Region reg(mInvalidateRegion);
mInvalidateRegion.clear();
return reg;
}
// ---------------------------------------------------------------------------
status_t SurfaceFlinger::renderScreenToTexture(DisplayID dpy,

7
services/surfaceflinger/SurfaceFlinger.h
View File

@ -303,6 +303,9 @@ private:
void composeSurfaces(const Region& dirty);
void setInvalidateRegion(const Region& reg);
Region getAndClearInvalidateRegion();
ssize_t addClientLayer(const sp<Client>& client,
const sp<LayerBaseClient>& lbc);
status_t addLayer_l(const sp<LayerBase>& layer);
@ -348,6 +351,10 @@ private:
bool mLayersRemoved;
DefaultKeyedVector< wp<IBinder>, wp<Layer> > mLayerMap;
// access must be protected by mInvalidateLock
mutable Mutex mInvalidateLock;
Region mInvalidateRegion;
// constant members (no synchronization needed for access)
sp<IMemoryHeap> mServerHeap;
surface_flinger_cblk_t* mServerCblk;