diff options
| author | Andreas Huber <andih@google.com> | 2010-06-25 09:25:19 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-06-25 11:05:37 -0700 |
| commit | e049a957ce2a529564a1312dca60e86d0bcb0964 (patch) | |
| tree | deb076b69ffbc2939d2a76c0fb3cdd38053f668d /libs/surfaceflinger/SurfaceFlinger.cpp | |
| parent | deaaf5029aaf5e2754a7b8f68d665cad3cb4e5b5 (diff) | |
| download | frameworks_native-e049a957ce2a529564a1312dca60e86d0bcb0964.zip frameworks_native-e049a957ce2a529564a1312dca60e86d0bcb0964.tar.gz frameworks_native-e049a957ce2a529564a1312dca60e86d0bcb0964.tar.bz2 | |
Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
This reverts commit 081bc5c47d8a980e6eafa70ddafcd89981586391.
Diffstat (limited to 'libs/surfaceflinger/SurfaceFlinger.cpp')
| -rw-r--r-- | libs/surfaceflinger/SurfaceFlinger.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libs/surfaceflinger/SurfaceFlinger.cpp b/libs/surfaceflinger/SurfaceFlinger.cpp index 23efd16..96a5411 100644 --- a/libs/surfaceflinger/SurfaceFlinger.cpp +++ b/libs/surfaceflinger/SurfaceFlinger.cpp @@ -44,7 +44,6 @@ #include <GLES/gl.h> #include "clz.h" -#include "GLExtensions.h" #include "Layer.h" #include "LayerBlur.h" #include "LayerBuffer.h" @@ -994,9 +993,7 @@ void SurfaceFlinger::drawWormhole() const glTexCoordPointer(2, GL_SHORT, 0, tcoords); glEnableClientState(GL_TEXTURE_COORD_ARRAY); #if defined(GL_OES_texture_external) - if (GLExtensions::getInstance().haveTextureExternal()) { - glDisable(GL_TEXTURE_EXTERNAL_OES); - } + glDisable(GL_TEXTURE_EXTERNAL_OES); #endif glEnable(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, mWormholeTexName); |