mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

GLES2: detach and delete shaders after LinkProgram

Browse source 
Also make sure program linked correctly!
This commit is contained in:
Dominique Martinet 2017-08-12 00:02:33 +02:00
parent de86965174
commit c323bfc6a0
1 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
render/gles2/renderer.c
View file

@ -30,7 +30,7 @@ static bool compile_shader(GLuint type, const GLchar *src, GLuint *shader) {
GL_CALL(glGetShaderInfoLog(*shader, loglen, &loglen, msg)); GL_CALL(glGetShaderInfoLog(*shader, loglen, &loglen, msg));
wlr_log(L_ERROR, "Shader compilation failed"); wlr_log(L_ERROR, "Shader compilation failed");
wlr_log(L_ERROR, "%s", msg); wlr_log(L_ERROR, "%s", msg);
exit(1); glDeleteShader(*shader);
return false; return false;
} }
return true; return true;
@ -43,13 +43,32 @@ static bool compile_program(const GLchar *vert_src,
return false; return false;
} }
if (!compile_shader(GL_FRAGMENT_SHADER, frag_src, &fragment)) { if (!compile_shader(GL_FRAGMENT_SHADER, frag_src, &fragment)) {
glDeleteProgram(vertex); glDeleteShader(vertex);
return false; return false;
} }
*program = GL_CALL(glCreateProgram()); *program = GL_CALL(glCreateProgram());
GL_CALL(glAttachShader(*program, vertex)); GL_CALL(glAttachShader(*program, vertex));
GL_CALL(glAttachShader(*program, fragment)); GL_CALL(glAttachShader(*program, fragment));
GL_CALL(glLinkProgram(*program)); GL_CALL(glLinkProgram(*program));
GLint success;
GL_CALL(glGetProgramiv(*program, GL_LINK_STATUS, &success));
if (success == GL_FALSE) {
GLint loglen;
GL_CALL(glGetProgramiv(*program, GL_INFO_LOG_LENGTH, &loglen));
GLchar msg[loglen];
GL_CALL(glGetProgramInfoLog(*program, loglen, &loglen, msg));
wlr_log(L_ERROR, "Program link failed");
wlr_log(L_ERROR, "%s", msg);
glDeleteProgram(*program);
glDeleteShader(vertex);
glDeleteShader(fragment);
return false;
}
glDetachShader(*program, vertex);
glDetachShader(*program, fragment);
glDeleteShader(vertex);
glDeleteShader(fragment);
return true; return true;
} }