commit 2d358c245f4bcf385e48648e1fb4b9d6d7f0dcdf
author The Android Automerger <android-build@android.com> Fri Oct 12 10:26:47 2012 -0700
committer The Android Automerger <android-build@android.com> Fri Oct 12 10:26:47 2012 -0700
tree ccb0559ee7ded219e0be48c8297a938c57534502
parent b763d5fffa2f942a6ae3637fab17439dd32dbebc
parent 8b4053a1aa0de3266ab6e23022d14265b54d2afa

merge in jb-mr1-factory-release history after reset to jb-mr1-dev

services/surfaceflinger/LayerScreenshot.cpp

diff --git a/services/surfaceflinger/LayerScreenshot.cpp b/services/surfaceflinger/LayerScreenshot.cpp
index 5c18ebd..1aa8c09 100644
--- a/services/surfaceflinger/LayerScreenshot.cpp
+++ b/services/surfaceflinger/LayerScreenshot.cpp
@@ -118,21 +118,21 @@
 
         if (s.alpha == 0xFF) {
             glDisable(GL_BLEND);
+            glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
         } else {
             glEnable(GL_BLEND);
-            glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+            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(0, 0, 0, alpha);
-
         glDisable(GL_TEXTURE_EXTERNAL_OES);
         glEnable(GL_TEXTURE_2D);
 
         glBindTexture(GL_TEXTURE_2D, mTextureName);
-        glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
         glMatrixMode(GL_TEXTURE);
         glLoadIdentity();
         glMatrixMode(GL_MODELVIEW);