diff options
| author | Mathias Agopian <mathias@google.com> | 2010-08-13 16:29:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-13 16:29:48 -0700 |
| commit | 6a73368be44f45a80cc4b65dc57b9ff529cb2d89 (patch) | |
| tree | 368c4feadfd7295b112dd2592386d8dc9e8228d4 /services | |
| parent | e300b8c10c306b575bbbec29d5572ba92a97785e (diff) | |
| parent | 10f5c99223663ec0de21c52c1206c3d35cc2fb15 (diff) | |
| download | frameworks_base-6a73368be44f45a80cc4b65dc57b9ff529cb2d89.zip frameworks_base-6a73368be44f45a80cc4b65dc57b9ff529cb2d89.tar.gz frameworks_base-6a73368be44f45a80cc4b65dc57b9ff529cb2d89.tar.bz2 | |
Merge "fix a typo that prevented glTexImage2D codepath to work" into gingerbread
Diffstat (limited to 'services')
| -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); |