diff --git a/libweston/renderer-gl/fragment.glsl b/libweston/renderer-gl/fragment.glsl index d747d4e7..a321e2b1 100644 --- a/libweston/renderer-gl/fragment.glsl +++ b/libweston/renderer-gl/fragment.glsl @@ -78,7 +78,7 @@ varying vec2 v_texcoord; uniform sampler2D tex1; uniform sampler2D tex2; uniform float alpha; -uniform vec4 color; +uniform vec4 unicolor; void main() @@ -118,7 +118,7 @@ main() gl_FragColor = yuva2rgba(y, u, v, alpha); } else if (c_variant == SHADER_VARIANT_SOLID) { - gl_FragColor = alpha * color; + gl_FragColor = alpha * unicolor; } else { /* Never reached, bad variant value. */ diff --git a/libweston/renderer-gl/gl-shaders.c b/libweston/renderer-gl/gl-shaders.c index 91ee307c..d5a7fe36 100644 --- a/libweston/renderer-gl/gl-shaders.c +++ b/libweston/renderer-gl/gl-shaders.c @@ -235,7 +235,8 @@ gl_shader_create(struct gl_renderer *gr, shader->tex_uniforms[1] = glGetUniformLocation(shader->program, "tex1"); shader->tex_uniforms[2] = glGetUniformLocation(shader->program, "tex2"); shader->alpha_uniform = glGetUniformLocation(shader->program, "alpha"); - shader->color_uniform = glGetUniformLocation(shader->program, "color"); + shader->color_uniform = glGetUniformLocation(shader->program, + "unicolor"); free(conf);