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

* commit '735b35fb1be6a9a5e63fa0c639ca2eed007f4c71': GLES2 translator: fix glUseProgram error
2011-07-11 15:59:12 -07:00
parent ec430289b4 735b35fb1b
commit 9e261942aa
1 changed files with 1 additions and 0 deletions
--- a/tools/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp
+++ b/tools/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp
@@ -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);
    }
 }