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
This commit is contained in:
Mathias Agopian
2010-08-13 16:32:43 -07:00
committed by Android Git Automerger

View File

@@ -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);