LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "GLES2 translator: DeleteShader/Program fix"

Browse Source
This commit is contained in:
David Turner
2011-07-11 15:42:13 -07:00
committed by Android Code Review
parent 05832ade78 a24932259f
commit e7db3af6de
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp
View File

@@ -392,8 +392,9 @@ GL_APICALL void GL_APIENTRY glDeleteTextures(GLsizei n, const GLuint* textures)
GL_APICALL void GL_APIENTRY glDeleteProgram(GLuint program){ GL_APICALL void GL_APIENTRY glDeleteProgram(GLuint program){
GET_CTX(); GET_CTX();
if(thrd->shareGroup.Ptr()) { if(program && thrd->shareGroup.Ptr()) {
const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program); const GLuint globalProgramName = thrd->shareGroup->getGlobalName(SHADER,program);
SET_ERROR_IF(!globalProgramName,GL_INVALID_VALUE);
thrd->shareGroup->deleteName(SHADER,program); thrd->shareGroup->deleteName(SHADER,program);
ctx->dispatcher().glDeleteProgram(globalProgramName); ctx->dispatcher().glDeleteProgram(globalProgramName);
} }
@@ -401,11 +402,13 @@ GL_APICALL void GL_APIENTRY glDeleteProgram(GLuint program){
GL_APICALL void GL_APIENTRY glDeleteShader(GLuint shader){ GL_APICALL void GL_APIENTRY glDeleteShader(GLuint shader){
GET_CTX(); GET_CTX();
if(thrd->shareGroup.Ptr()) { if(shader && thrd->shareGroup.Ptr()) {
const GLuint globalShaderName = thrd->shareGroup->getGlobalName(SHADER,shader); const GLuint globalShaderName = thrd->shareGroup->getGlobalName(SHADER,shader);
SET_ERROR_IF(!globalShaderName,GL_INVALID_VALUE);
thrd->shareGroup->deleteName(SHADER,shader); thrd->shareGroup->deleteName(SHADER,shader);
ctx->dispatcher().glDeleteShader(globalShaderName); ctx->dispatcher().glDeleteShader(globalShaderName);
} }
} }
GL_APICALL void GL_APIENTRY glDepthFunc(GLenum func){ GL_APICALL void GL_APIENTRY glDepthFunc(GLenum func){