system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-09-06 09:56:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

gl-renderer: rename color uniform to unicolor

Browse source 
A more unique name is easier to grep for. Using 'color' as a local
variable might be useful in the future.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2021-02-02 16:52:35 +02:00
parent f6a8aa15f5
commit a8d5ef4a04
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libweston/renderer-gl/fragment.glsl
View file

@ -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. */

3
libweston/renderer-gl/gl-shaders.c
View file

@ -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);