commit 9b4b1180941f4d2ef9d3e7bd26bc1855ff9fb141
author Dave Burke <daveburke@google.com> Wed Oct 02 10:41:57 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 02 10:41:57 2013 -0700
tree 98809267edd9e36aba439001cb8a4282b04b54e2
parent f3fa0712282e760c316f44cba05f884f9399b98f
parent 0699350336cccc244bb6c52a0d910f9599253812

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

* commit '0699350336cccc244bb6c52a0d910f9599253812':
  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 b5b0f2c..e374548 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1597,9 +1597,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