diff options
| author | Mathias Agopian <mathias@google.com> | 2010-08-13 16:32:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-13 16:32:43 -0700 |
| commit | b2c315ebe79359fa443533f9ab55e9b730938e41 (patch) | |
| tree | 310cb482dcf9e4fcc27fcdd4fc5defd82742bd67 | |
| parent | 993f85f3194000d0eb212f361431c9319548b144 (diff) | |
| parent | 6a73368be44f45a80cc4b65dc57b9ff529cb2d89 (diff) | |
| download | frameworks_base-b2c315ebe79359fa443533f9ab55e9b730938e41.zip frameworks_base-b2c315ebe79359fa443533f9ab55e9b730938e41.tar.gz frameworks_base-b2c315ebe79359fa443533f9ab55e9b730938e41.tar.bz2 | |
am 6a73368b: Merge "fix a typo that prevented glTexImage2D codepath to work" into gingerbread
Merge commit '6a73368be44f45a80cc4b65dc57b9ff529cb2d89' into gingerbread-plus-aosp
* commit '6a73368be44f45a80cc4b65dc57b9ff529cb2d89':
fix a typo that prevented glTexImage2D codepath to work
| -rw-r--r-- | services/surfaceflinger/TextureManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/TextureManager.cpp b/services/surfaceflinger/TextureManager.cpp index 3b326df..0f448e0 100644 --- a/services/surfaceflinger/TextureManager.cpp +++ b/services/surfaceflinger/TextureManager.cpp @@ -190,7 +190,7 @@ status_t TextureManager::loadTexture(Texture* texture, return err; } - if (texture->target != GL_TEXTURE_2D) + if (texture->target != Texture::TEXTURE_2D) return INVALID_OPERATION; glBindTexture(GL_TEXTURE_2D, texture->name); |