am e70fbe8b: am 02b95105: fix transitions from hwc to GLES composition

* commit 'e70fbe8b32687d9178e828d6023de599be5431c3':
  fix transitions from hwc to GLES composition
This commit is contained in:
Mathias Agopian 2012-11-05 18:17:18 -08:00 committed by Android Git Automerger
commit 731e0331eb

View File

@ -978,10 +978,10 @@ void SurfaceFlinger::doComposition() {
if (hw->canDraw()) { if (hw->canDraw()) {
// transform the dirty region into this screen's coordinate space // transform the dirty region into this screen's coordinate space
const Region dirtyRegion(hw->getDirtyRegion(repaintEverything)); const Region dirtyRegion(hw->getDirtyRegion(repaintEverything));
if (!dirtyRegion.isEmpty()) {
// repaint the framebuffer (if needed) // repaint the framebuffer (if needed)
doDisplayComposition(hw, dirtyRegion); doDisplayComposition(hw, dirtyRegion);
}
hw->dirtyRegion.clear(); hw->dirtyRegion.clear();
hw->flip(hw->swapRegion); hw->flip(hw->swapRegion);
hw->swapRegion.clear(); hw->swapRegion.clear();