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 | 998831fbc3fc82beb0c490ee49d8748bbbb888e9 (patch) | |
| tree | 1212512cf1096f404379e59482f2be2494729b63 /services | |
| parent | f8d7290f080d9ac20e0a8236f1665cb9dedc83a0 (diff) | |
| parent | f1c468e48160208afe4919f57de464369cd3cafc (diff) | |
| download | frameworks_native-998831fbc3fc82beb0c490ee49d8748bbbb888e9.zip frameworks_native-998831fbc3fc82beb0c490ee49d8748bbbb888e9.tar.gz frameworks_native-998831fbc3fc82beb0c490ee49d8748bbbb888e9.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); |