mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gl-shaders: Don't attempt to set unicolor when it's not valid

Browse Source 
It should harmlessly fail or do nothing, but seeing attempts to set
uniform -1 can be confusing when looking for real shader issues.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2023-01-13 12:25:22 -06:00 committed by Daniel Stone
parent 3012934a6d
commit 19ea037399
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libweston/renderer-gl/gl-shaders.c
View File

@ -291,8 +291,13 @@ gl_shader_create(struct gl_renderer *gr,
shader->tex_uniforms[1] = glGetUniformLocation(shader->program, "tex1"); shader->tex_uniforms[1] = glGetUniformLocation(shader->program, "tex1");
shader->tex_uniforms[2] = glGetUniformLocation(shader->program, "tex2"); shader->tex_uniforms[2] = glGetUniformLocation(shader->program, "tex2");
shader->view_alpha_uniform = glGetUniformLocation(shader->program, "view_alpha"); shader->view_alpha_uniform = glGetUniformLocation(shader->program, "view_alpha");
shader->color_uniform = glGetUniformLocation(shader->program, if (requirements->variant == SHADER_VARIANT_SOLID) {
"unicolor"); shader->color_uniform = glGetUniformLocation(shader->program,
"unicolor");
assert(shader->color_uniform != -1);
} else {
shader->color_uniform = -1;
}
shader->color_pre_curve_lut_2d_uniform = shader->color_pre_curve_lut_2d_uniform =
glGetUniformLocation(shader->program, "color_pre_curve_lut_2d"); glGetUniformLocation(shader->program, "color_pre_curve_lut_2d");
shader->color_pre_curve_lut_scale_offset_uniform = shader->color_pre_curve_lut_scale_offset_uniform =
@ -534,7 +539,10 @@ gl_shader_load_config(struct gl_shader *shader,
glUniformMatrix4fv(shader->proj_uniform, glUniformMatrix4fv(shader->proj_uniform,
1, GL_FALSE, sconf->projection.d); 1, GL_FALSE, sconf->projection.d);
glUniform4fv(shader->color_uniform, 1, sconf->unicolor);
if (shader->color_uniform != -1)
glUniform4fv(shader->color_uniform, 1, sconf->unicolor);
glUniform1f(shader->view_alpha_uniform, sconf->view_alpha); glUniform1f(shader->view_alpha_uniform, sconf->view_alpha);
in_tgt = gl_shader_texture_variant_get_target(sconf->req.variant); in_tgt = gl_shader_texture_variant_get_target(sconf->req.variant);