summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2012-11-05 18:17:18 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-05 18:17:18 -0800
commit731e0331eb402ec4564b69eaeb8b605a8b800b1b (patch)
treea2a6e68cc2290b115ddfa097f5007b28c263817f
parente2d4cc28d72db0d49e61ed4ceeb878436cafb23a (diff)
parente70fbe8b32687d9178e828d6023de599be5431c3 (diff)
downloadnative-731e0331eb402ec4564b69eaeb8b605a8b800b1b.tar.gz
am e70fbe8b: am 02b95105: fix transitions from hwc to GLES composition
* commit 'e70fbe8b32687d9178e828d6023de599be5431c3': fix transitions from hwc to GLES composition
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 7ee6e5ead4..ce10c78194 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -978,10 +978,10 @@ void SurfaceFlinger::doComposition() {
if (hw->canDraw()) {
// transform the dirty region into this screen's coordinate space
const Region dirtyRegion(hw->getDirtyRegion(repaintEverything));
- if (!dirtyRegion.isEmpty()) {
- // repaint the framebuffer (if needed)
- doDisplayComposition(hw, dirtyRegion);
- }
+
+ // repaint the framebuffer (if needed)
+ doDisplayComposition(hw, dirtyRegion);
+
hw->dirtyRegion.clear();
hw->flip(hw->swapRegion);
hw->swapRegion.clear();