commit c5214289d6279d71d7396a941e5ad6969ba053dc
author Dave Burke <daveburke@google.com> Wed Oct 02 10:44:44 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 02 10:44:44 2013 -0700
tree 871f64e259a1ad63b368ace0f5ecd0367f8a8523
parent fee52e20b9fc9a02dbeeb75458972c14682c5400
parent 9b4b1180941f4d2ef9d3e7bd26bc1855ff9fb141

am 9b4b1180: am 06993503: Merge "only clear FB when asked for the opaque layer" into klp-dev

* commit '9b4b1180941f4d2ef9d3e7bd26bc1855ff9fb141':
  only clear FB when asked for the opaque layer

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index b438752..6d343fd 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1604,9 +1604,10 @@
             if (!clip.isEmpty()) {
                 switch (cur->getCompositionType()) {
                     case HWC_OVERLAY: {
+                        const Layer::State& state(layer->getDrawingState());
                         if ((cur->getHints() & HWC_HINT_CLEAR_FB)
                                 && i
-                                && layer->isOpaque()
+                                && layer->isOpaque() && (state.alpha == 0xFF)
                                 && hasGlesComposition) {
                             // never clear the very first layer since we're
                             // guaranteed the FB is already cleared