am 7c91ae77: Merge "tex 0 is legal."

* commit '7c91ae77caa1b277bba162ada95a8a104da9923c':
  tex 0 is legal.
This commit is contained in:
David Turner
2011-06-28 04:55:41 -07:00
committed by Android Git Automerger

View File

@@ -167,8 +167,6 @@ GLESiface* __translator_getIfaces(EGLiface* eglIface){
static TextureData* getTextureData(){ static TextureData* getTextureData(){
GET_CTX_RET(NULL); GET_CTX_RET(NULL);
unsigned int tex = ctx->getBindedTexture(); unsigned int tex = ctx->getBindedTexture();
if (tex==0)
return NULL;
TextureData *texData = NULL; TextureData *texData = NULL;
ObjectDataPtr objData = thrd->shareGroup->getObjectData(TEXTURE,tex); ObjectDataPtr objData = thrd->shareGroup->getObjectData(TEXTURE,tex);
if(!objData.Ptr()){ if(!objData.Ptr()){