diff options
| author | Jesse Hall <jessehall@google.com> | 2012-10-15 12:38:33 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2012-10-22 10:37:22 -0700 |
| commit | 4ea5d656db0f5fcc4ae6c792ec83e157a2c1bae8 (patch) | |
| tree | 3e3b902b20b8e336ad0b96312fb4bad8b9e8c4ad | |
| parent | 529efdf60f2015e591dd9cd62e8802c583a8917a (diff) | |
| download | frameworks_native-4ea5d656db0f5fcc4ae6c792ec83e157a2c1bae8.zip frameworks_native-4ea5d656db0f5fcc4ae6c792ec83e157a2c1bae8.tar.gz frameworks_native-4ea5d656db0f5fcc4ae6c792ec83e157a2c1bae8.tar.bz2 | |
Always set vertex alpha when drawing screenshot layers
The screenshot is a GL_RGB texture, and the GL_REPLACE texture env
mode uses vertex alpha for GL_RGB textures instead of alpha=1.0.
Bug: 7340077
Change-Id: I6fbb907023e48f9c422b15a33da79757d6726840
| -rw-r--r-- | services/surfaceflinger/LayerScreenshot.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ void LayerScreenshot::onDraw(const sp<const DisplayDevice>& hw, const Region& cl } 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); |