Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6a73368b: Merge "fix a typo that prevented glTexImage2D codepath to work" into gingerbread

Browse Source 
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
parent 993f85f319 6a73368be4
commit b2c315ebe7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/surfaceflinger/TextureManager.cpp
View File

@@ -190,7 +190,7 @@ status_t TextureManager::loadTexture(Texture* texture,
return err; return err;
} }
if (texture->target != GL_TEXTURE_2D) if (texture->target != Texture::TEXTURE_2D)
return INVALID_OPERATION; return INVALID_OPERATION;
glBindTexture(GL_TEXTURE_2D, texture->name); glBindTexture(GL_TEXTURE_2D, texture->name);