summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Xavier Ducrohet <xav@android.com> 2011-10-21 16:18:48 -0700
committer Xavier Ducrohet <xav@android.com> 2011-10-24 13:29:26 -0700
commitc9c85fb2d246799ee40dc2373b5322625a74f47e (patch)
tree81d4dc3c7d85ce941903920bc19aa39ca4eca268
parentd4f3e054e082a1534a2f41a1faa6f39edcc69621 (diff)
CherryPick f9e455 from master to mr0. do not merge.
Fix software GL renderer. Change-Id: I7273a8e65c23a0032d155ea6572de2923791e411
-rw-r--r--services/surfaceflinger/Layer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index f885fc7fbf..50b86043d5 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -284,8 +284,8 @@ void Layer::onDraw(const Region& clip) const
glMatrixMode(GL_TEXTURE);
glLoadMatrixf(mTextureMatrix);
glMatrixMode(GL_MODELVIEW);
- glEnable(GL_TEXTURE_EXTERNAL_OES);
glDisable(GL_TEXTURE_2D);
+ glEnable(GL_TEXTURE_EXTERNAL_OES);
} else {
glBindTexture(GL_TEXTURE_2D, mFlinger->getProtectedTexName());
glMatrixMode(GL_TEXTURE);