sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

cogl-pipeline: Fix the layer_has_alpha_cb

Browse source 
_cogl_pipeline_needs_blending_enabled tries to determine whether each
layer is using the default combine state. However it was using
argument 0 for both checks so the if-statement would never be true.
This commit is contained in:
Neil Roberts 2010-12-06 21:14:33 +00:00 committed by Robert Bragg
parent 3984f79c28
commit 62a12a16a2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cogl/cogl-pipeline.c
View file

@ -749,8 +749,8 @@ layer_has_alpha_cb (CoglPipelineLayer *layer, void *data)
if (big_state->texture_combine_alpha_func != GL_MODULATE || if (big_state->texture_combine_alpha_func != GL_MODULATE ||
big_state->texture_combine_alpha_src[0] != GL_PREVIOUS || big_state->texture_combine_alpha_src[0] != GL_PREVIOUS ||
big_state->texture_combine_alpha_op[0] != GL_SRC_ALPHA || big_state->texture_combine_alpha_op[0] != GL_SRC_ALPHA ||
big_state->texture_combine_alpha_src[0] != GL_TEXTURE || big_state->texture_combine_alpha_src[1] != GL_TEXTURE ||
big_state->texture_combine_alpha_op[0] != GL_SRC_ALPHA) big_state->texture_combine_alpha_op[1] != GL_SRC_ALPHA)
{ {
*has_alpha = TRUE; *has_alpha = TRUE;
/* return FALSE to stop iterating layers... */ /* return FALSE to stop iterating layers... */