commit b0f53003562ccdc3d9359f2d2e10d0e2e973e91c
author Eric Fischer <enf@google.com> Mon Oct 24 16:59:41 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 24 16:59:41 2011 -0700
tree 81d4dc3c7d85ce941903920bc19aa39ca4eca268
parent ac1fc6a4921360c48a3ceebd7016d05601f3ffba
parent 724e6d05ebce56a2190c1f3a81a3f527fad5384a

Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

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