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

SurfaceFlinger: don't always set HWC_GEOM_CHGD

Browse Source 
This change fixes a bug in SurfaceFlinger that caused the HWC_GEOMETRY_CHANGED
flag to be set every flip.

Change-Id: I4f395a2883bcbb53b23b3d14941aff108739c9f0
Bug: 7234237
This commit is contained in:
Jamie Gennis 2012-09-25 20:26:00 -07:00 committed by Android (Google) Code Review
parent cb094a783f
commit a4310c8be2
1 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -940,8 +940,31 @@ void SurfaceFlinger::setUpHWComposer() {
HWComposer& hwc(getHwComposer()); HWComposer& hwc(getHwComposer());
if (hwc.initCheck() == NO_ERROR) { if (hwc.initCheck() == NO_ERROR) {
// build the h/w work list // build the h/w work list
const bool workListsDirty = mHwWorkListDirty; if (CC_UNLIKELY(mHwWorkListDirty)) {
mHwWorkListDirty = false; mHwWorkListDirty = false;
for (size_t dpy=0 ; dpy<mDisplays.size() ; dpy++) {
sp<const DisplayDevice> hw(mDisplays[dpy]);
const int32_t id = hw->getHwcDisplayId();
if (id >= 0) {
const Vector< sp<LayerBase> >& currentLayers(
hw->getVisibleLayersSortedByZ());
const size_t count = currentLayers.size();
if (hwc.createWorkList(id, count) == NO_ERROR) {
HWComposer::LayerListIterator cur = hwc.begin(id);
const HWComposer::LayerListIterator end = hwc.end(id);
for (size_t i=0 ; cur!=end && i<count ; ++i, ++cur) {
const sp<LayerBase>& layer(currentLayers[i]);
layer->setGeometry(hw, *cur);
if (mDebugDisableHWC || mDebugRegion) {
cur->setSkip(true);
}
}
}
}
}
}
// set the per-frame data
for (size_t dpy=0 ; dpy<mDisplays.size() ; dpy++) { for (size_t dpy=0 ; dpy<mDisplays.size() ; dpy++) {
sp<const DisplayDevice> hw(mDisplays[dpy]); sp<const DisplayDevice> hw(mDisplays[dpy]);
const int32_t id = hw->getHwcDisplayId(); const int32_t id = hw->getHwcDisplayId();
@ -949,28 +972,19 @@ void SurfaceFlinger::setUpHWComposer() {
const Vector< sp<LayerBase> >& currentLayers( const Vector< sp<LayerBase> >& currentLayers(
hw->getVisibleLayersSortedByZ()); hw->getVisibleLayersSortedByZ());
const size_t count = currentLayers.size(); const size_t count = currentLayers.size();
if (hwc.createWorkList(id, count) >= 0) { HWComposer::LayerListIterator cur = hwc.begin(id);
HWComposer::LayerListIterator cur = hwc.begin(id); const HWComposer::LayerListIterator end = hwc.end(id);
const HWComposer::LayerListIterator end = hwc.end(id); for (size_t i=0 ; cur!=end && i<count ; ++i, ++cur) {
for (size_t i=0 ; cur!=end && i<count ; ++i, ++cur) { /*
const sp<LayerBase>& layer(currentLayers[i]); * update the per-frame h/w composer data for each layer
* and build the transparent region of the FB
if (CC_UNLIKELY(workListsDirty)) { */
layer->setGeometry(hw, *cur); const sp<LayerBase>& layer(currentLayers[i]);
if (mDebugDisableHWC || mDebugRegion) { layer->setPerFrameData(hw, *cur);
cur->setSkip(true);
}
}
/*
* update the per-frame h/w composer data for each layer
* and build the transparent region of the FB
*/
layer->setPerFrameData(hw, *cur);
}
} }
} }
} }
status_t err = hwc.prepare(); status_t err = hwc.prepare();
ALOGE_IF(err, "HWComposer::prepare failed (%s)", strerror(-err)); ALOGE_IF(err, "HWComposer::prepare failed (%s)", strerror(-err));
} }