commit b96fe08540dcf7e90be56919ea9863f687da779c
author Romain Guy <romainguy@google.com> Mon Oct 15 18:43:19 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 15 18:43:20 2012 -0700
tree a9e4ea69919c8e37ef377807b19effac9cc6593a
parent 837d2f9e83e7d8625ef482d9c9d9afa852c8dbaa
parent 1cffc80f978c55f09203d9d9a905775b951ba59a

Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev

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);