diff options
| author | Mathias Agopian <mathias@google.com> | 2011-09-22 21:01:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-22 21:01:21 -0700 |
| commit | 059fd18396605592ec538b9e5574a80a8987d10d (patch) | |
| tree | 81e904ced86ff0d345781382171a55eb7a73bce6 /services | |
| parent | cfb7d090bbbb881def949a548b7ad8022e370dd4 (diff) | |
| parent | cd20eb09c4752531c1ab1a0084474ef530a5d44f (diff) | |
| download | frameworks_native-059fd18396605592ec538b9e5574a80a8987d10d.zip frameworks_native-059fd18396605592ec538b9e5574a80a8987d10d.tar.gz frameworks_native-059fd18396605592ec538b9e5574a80a8987d10d.tar.bz2 | |
Merge "don't clear the framebuffer when the framebuffer is not used"
Diffstat (limited to 'services')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 09097ee..3f154ce 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -986,19 +986,20 @@ void SurfaceFlinger::setupHardwareComposer(Region& dirtyInOut) void SurfaceFlinger::composeSurfaces(const Region& dirty) { - if (UNLIKELY(!mWormholeRegion.isEmpty())) { + const DisplayHardware& hw(graphicPlane(0).displayHardware()); + HWComposer& hwc(hw.getHwComposer()); + + const size_t fbLayerCount = hwc.getLayerCount(HWC_FRAMEBUFFER); + if (UNLIKELY(fbLayerCount && !mWormholeRegion.isEmpty())) { // should never happen unless the window manager has a bug // draw something... drawWormhole(); } - const DisplayHardware& hw(graphicPlane(0).displayHardware()); - HWComposer& hwc(hw.getHwComposer()); - hwc_layer_t* const cur(hwc.getLayers()); - /* * and then, render the layers targeted at the framebuffer */ + hwc_layer_t* const cur(hwc.getLayers()); const Vector< sp<LayerBase> >& layers(mVisibleLayersSortedByZ); size_t count = layers.size(); for (size_t i=0 ; i<count ; i++) { |