am 14fa0201: am c559f761: Merge "GLES2 translator: fix glUseProgram error"

* commit '14fa0201119dd8cf94a5316ff8ab9f0c19f9dd44':
  GLES2 translator: fix glUseProgram error
This commit is contained in:
David Turner
2011-07-11 15:57:08 -07:00
committed by Android Git Automerger

View File

@@ -1235,6 +1235,7 @@ GL_APICALL void GL_APIENTRY glUseProgram(GLuint program){
GET_CTX();
if(thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
SET_ERROR_IF(program!=0 && globalProgramName==0,GL_INVALID_VALUE);
ctx->dispatcher().glUseProgram(globalProgramName);
}
}