commit c558269b1ab8c4985b86a0f39338d42f162693f2
author Jesse Hall <jessehall@google.com> Mon Oct 15 14:59:16 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 15 14:59:16 2012 -0700
tree cad554b150e6d2e9f4037300391ff9f5dd51b77b
parent 935ba80962920ff420bd4714046d1e4d8910889b
parent 837d2f9e83e7d8625ef482d9c9d9afa852c8dbaa

am 837d2f9e: Always set vertex alpha when drawing screenshot layers

* commit '837d2f9e83e7d8625ef482d9c9d9afa852c8dbaa':
  Always set vertex alpha when drawing screenshot layers

services/surfaceflinger/LayerScreenshot.cpp

diff --git a/services/surfaceflinger/LayerScreenshot.cpp b/services/surfaceflinger/LayerScreenshot.cpp
index 1aa8c09..0fd744f 100644
--- a/services/surfaceflinger/LayerScreenshot.cpp
+++ b/services/surfaceflinger/LayerScreenshot.cpp
@@ -122,13 +122,14 @@
         } else {
             glEnable(GL_BLEND);
             glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-            glColor4f(alpha, alpha, alpha, alpha);
             glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
         }
 
         LayerMesh mesh;
         computeGeometry(hw, &mesh);
 
+        glColor4f(alpha, alpha, alpha, alpha);
+
         glDisable(GL_TEXTURE_EXTERNAL_OES);
         glEnable(GL_TEXTURE_2D);