commit e869ca9626146265bbb2b5043018dfe532e0661f
author Xavier Ducrohet <xav@android.com> Fri Oct 21 16:18:48 2011 -0700
committer Xavier Ducrohet <xav@android.com> Mon Oct 24 13:29:26 2011 -0700
tree 96bd5bf5295bd50f7b96a28098f1f1cb32bc1039
parent c9c417c85d08074e5ececd5c74db1364e9c097c2

CherryPick f9e455 from master to mr0. do not merge.

Fix software GL renderer.

Change-Id: I7273a8e65c23a0032d155ea6572de2923791e411

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index f885fc7..50b8604 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -284,8 +284,8 @@
         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);