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 | 330dd304a471d260a73e342a240921c03c825f99 (patch) | |
| tree | dc4fb488faab0e0f3fac616cb8cb58632cf32d7b /libs/surfaceflinger/LayerBlur.cpp | |
| parent | 357f8209f3aec63fa2779da4eeab8825f80b0a41 (diff) | |
| download | frameworks_base-330dd304a471d260a73e342a240921c03c825f99.zip frameworks_base-330dd304a471d260a73e342a240921c03c825f99.tar.gz frameworks_base-330dd304a471d260a73e342a240921c03c825f99.tar.bz2 | |
Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
This reverts commit 081bc5c47d8a980e6eafa70ddafcd89981586391.
Diffstat (limited to 'libs/surfaceflinger/LayerBlur.cpp')
| -rw-r--r-- | libs/surfaceflinger/LayerBlur.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/surfaceflinger/LayerBlur.cpp b/libs/surfaceflinger/LayerBlur.cpp index 64a43c7..c1c440b 100644 --- a/libs/surfaceflinger/LayerBlur.cpp +++ b/libs/surfaceflinger/LayerBlur.cpp @@ -147,9 +147,7 @@ void LayerBlur::onDraw(const Region& clip) const Region::const_iterator const end = clip.end(); if (it != end) { #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, mTextureName); @@ -183,7 +181,7 @@ void LayerBlur::onDraw(const Region& clip) const bl.data = (GGLubyte*)pixels; blurFilter(&bl, 8, 2); - if (GLExtensions::getInstance().haveNpot()) { + if (mFlags & (DisplayHardware::NPOT_EXTENSION)) { glTexImage2D(GL_TEXTURE_2D, 0, mReadFormat, w, h, 0, mReadFormat, mReadType, pixels); mWidthScale = 1.0f / w; |