mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gl-renderer: Fail earlier if shader compilation fails 

If we can't compile our shaders, there's no point trying to link them.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2020-02-03 20:00:54 +00:00
parent 7b36f171d0
commit 6d2e73b314
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libweston/renderer-gl/gl-renderer.c
View File

@ -2970,6 +2970,8 @@ shader_init(struct gl_shader *shader, struct gl_renderer *renderer,
shader->vertex_shader =
compile_shader(GL_VERTEX_SHADER, 1, &vertex_source);
if (shader->vertex_shader == GL_NONE)
return -1;
if (renderer->fragment_shader_debug) {
sources[0] = fragment_source;
@ -2984,6 +2986,8 @@ shader_init(struct gl_shader *shader, struct gl_renderer *renderer,
shader->fragment_shader =
compile_shader(GL_FRAGMENT_SHADER, count, sources);
if (shader->fragment_shader == GL_NONE)
return -1;
shader->program = glCreateProgram();
glAttachShader(shader->program, shader->vertex_shader);