diff options
| author | Mathias Agopian <mathias@google.com> | 2010-06-24 21:22:43 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2010-06-24 21:28:59 -0700 |
| commit | 081bc5c47d8a980e6eafa70ddafcd89981586391 (patch) | |
| tree | 7f69e950394cfd54a2bd5083345fba31fb330d9c /libs/surfaceflinger/SurfaceFlinger.cpp | |
| parent | 8896783dc1d31c5274b277c364da0ffe7cc27cca (diff) | |
| download | frameworks_base-081bc5c47d8a980e6eafa70ddafcd89981586391.zip frameworks_base-081bc5c47d8a980e6eafa70ddafcd89981586391.tar.gz frameworks_base-081bc5c47d8a980e6eafa70ddafcd89981586391.tar.bz2 | |
fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Make sure to not use GL_TEXTURE_EXTERNAL when it's not supported
by the GL. The error was harmless, but annoying.
Change-Id: I571a9a9b05d35da51420950a6a6e95629067efd0
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 96a5411..23efd16 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); |