diff options
| author | Mathias Agopian <mathias@google.com> | 2010-09-16 17:55:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-16 17:55:05 -0700 |
| commit | 1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69 (patch) | |
| tree | e7255811abb746f8aab24c2048fa2134b5420c72 /services/surfaceflinger/TextureManager.cpp | |
| parent | 08710dcd589432c5828cefce25e4b565b15de9a6 (diff) | |
| parent | e20a56d929fc8fedc2b468ea6d1900bd2aa6e81a (diff) | |
| download | frameworks_base-1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69.zip frameworks_base-1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69.tar.gz frameworks_base-1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69.tar.bz2 | |
Merge "surfaceflinger / GL extensions cleanup" into gingerbread
Diffstat (limited to 'services/surfaceflinger/TextureManager.cpp')
| -rw-r--r-- | services/surfaceflinger/TextureManager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/surfaceflinger/TextureManager.cpp b/services/surfaceflinger/TextureManager.cpp index 76f6159..c9a15f5 100644 --- a/services/surfaceflinger/TextureManager.cpp +++ b/services/surfaceflinger/TextureManager.cpp @@ -43,7 +43,7 @@ TextureManager::TextureManager() } GLenum TextureManager::getTextureTarget(const Image* image) { -#if defined(GL_OES_texture_external) +#if defined(GL_OES_EGL_image_external) switch (image->target) { case Texture::TEXTURE_EXTERNAL: return GL_TEXTURE_EXTERNAL_OES; @@ -85,7 +85,7 @@ status_t TextureManager::initTexture(Image* pImage, int32_t format) pImage->height = 0; GLenum target = GL_TEXTURE_2D; -#if defined(GL_OES_texture_external) +#if defined(GL_OES_EGL_image_external) if (GLExtensions::getInstance().haveTextureExternal()) { if (format && isYuvFormat(format)) { target = GL_TEXTURE_EXTERNAL_OES; @@ -306,7 +306,7 @@ void TextureManager::activateTexture(const Texture& texture, bool filter) if (target == GL_TEXTURE_2D) { glBindTexture(GL_TEXTURE_2D, texture.name); glEnable(GL_TEXTURE_2D); -#if defined(GL_OES_texture_external) +#if defined(GL_OES_EGL_image_external) if (GLExtensions::getInstance().haveTextureExternal()) { glDisable(GL_TEXTURE_EXTERNAL_OES); } @@ -329,7 +329,7 @@ void TextureManager::activateTexture(const Texture& texture, bool filter) void TextureManager::deactivateTextures() { glDisable(GL_TEXTURE_2D); -#if defined(GL_OES_texture_external) +#if defined(GL_OES_EGL_image_external) if (GLExtensions::getInstance().haveTextureExternal()) { glDisable(GL_TEXTURE_EXTERNAL_OES); } |