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

compositor: Don't just update uniforms when we change shaders

Browse Source 
The uniforms change from surface to surface or output to output, so always
set them.
This commit is contained in:
Kristian Høgsberg
2012-01-31 15:38:36 -05:00
parent 2ad3b7f866
commit 0452abc820
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
+9 -6
View File
@@ -699,15 +699,18 @@ weston_surface_draw(struct weston_surface *es, struct weston_output *output)
if (ec->current_shader != es->shader) { if (ec->current_shader != es->shader) {
glUseProgram(es->shader->program); glUseProgram(es->shader->program);
glUniformMatrix4fv(es->shader->proj_uniform,
1, GL_FALSE, output->matrix.d);
if (es->shader->tex_uniform != GL_NONE)
glUniform1i(es->shader->tex_uniform, 0);
if (es->shader->color_uniform != GL_NONE)
glUniform4fv(es->shader->color_uniform,1, es->color);
ec->current_shader = es->shader; ec->current_shader = es->shader;
} }
glUniformMatrix4fv(es->shader->proj_uniform,
1, GL_FALSE, output->matrix.d);
if (es->shader->tex_uniform != GL_NONE)
glUniform1i(es->shader->tex_uniform, 0);
if (es->shader->color_uniform != GL_NONE)
glUniform4fv(es->shader->color_uniform,1, es->color);
if (es->shader->alpha_uniform && es->alpha != ec->current_alpha) { if (es->shader->alpha_uniform && es->alpha != ec->current_alpha) {
glUniform1f(es->shader->alpha_uniform, es->alpha / 255.0); glUniform1f(es->shader->alpha_uniform, es->alpha / 255.0);
ec->current_alpha = es->alpha; ec->current_alpha = es->alpha;