diff options
| author | Mathias Agopian <mathias@google.com> | 2010-08-16 15:17:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-16 15:17:59 -0700 |
| commit | 2565c5b6ef6c9020e8c4b9454ea9ac1b92bdf390 (patch) | |
| tree | cf2fc0a22920d2625ad0e99e3f6106237a8493f7 | |
| parent | fb5d9e7c2a0f48d03d1c2600ac36792f13f1d981 (diff) | |
| parent | b2c315ebe79359fa443533f9ab55e9b730938e41 (diff) | |
| download | frameworks_base-2565c5b6ef6c9020e8c4b9454ea9ac1b92bdf390.zip frameworks_base-2565c5b6ef6c9020e8c4b9454ea9ac1b92bdf390.tar.gz frameworks_base-2565c5b6ef6c9020e8c4b9454ea9ac1b92bdf390.tar.bz2 | |
am b2c315eb: am 6a73368b: Merge "fix a typo that prevented glTexImage2D codepath to work" into gingerbread
Merge commit 'b2c315ebe79359fa443533f9ab55e9b730938e41'
* commit 'b2c315ebe79359fa443533f9ab55e9b730938e41':
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); |