diff options
| author | 2010-06-28 20:01:58 -0700 | |
|---|---|---|
| committer | 2010-06-28 20:01:58 -0700 | |
| commit | f0562b4b071b74a760ad9c9caa0e41687ae6f407 (patch) | |
| tree | 7727eecba3edba2862dd90174a3348028dab83fe /libs/surfaceflinger/SurfaceFlinger.cpp | |
| parent | 31e0ffe8444b70500cac319da084c4c45e62aca2 (diff) | |
| parent | 8fa4c811e6d0da82282f9db1a32706399ee538bc (diff) | |
Merge changes I93dfc4c8,I781953d6 into gingerbread
* changes:
fix[2798925] Gingerbread TOT not booting
Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
Diffstat (limited to 'libs/surfaceflinger/SurfaceFlinger.cpp')
| -rw-r--r-- | libs/surfaceflinger/SurfaceFlinger.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/surfaceflinger/SurfaceFlinger.cpp b/libs/surfaceflinger/SurfaceFlinger.cpp index 96a541184edb..23efd161fad7 100644 --- a/libs/surfaceflinger/SurfaceFlinger.cpp +++ b/libs/surfaceflinger/SurfaceFlinger.cpp @@ -44,6 +44,7 @@ #include <GLES/gl.h> #include "clz.h" +#include "GLExtensions.h" #include "Layer.h" #include "LayerBlur.h" #include "LayerBuffer.h" @@ -993,7 +994,9 @@ void SurfaceFlinger::drawWormhole() const glTexCoordPointer(2, GL_SHORT, 0, tcoords); glEnableClientState(GL_TEXTURE_COORD_ARRAY); #if defined(GL_OES_texture_external) - glDisable(GL_TEXTURE_EXTERNAL_OES); + if (GLExtensions::getInstance().haveTextureExternal()) { + glDisable(GL_TEXTURE_EXTERNAL_OES); + } #endif glEnable(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, mWormholeTexName); |