brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl-material: Set the blend equation even if blend funcs are the same

Browse Source 
Previously it would only try to set the blend equation if the RGB and
alpha blending functions were different. However it's completely valid
to use a non-standard blending function when the functions are the
same. This patch moves the blending equation to outside the if
statement.
This commit is contained in:
Neil Roberts
2010-05-12 18:57:52 +01:00
parent dd9e7853ec
commit 7caa10160d
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
clutter/cogl/cogl/cogl-material.c
View File

@ -1710,6 +1710,13 @@ _cogl_material_flush_base_gl_state (CoglMaterial *material,
#endif #endif
#ifndef HAVE_COGL_GLES /* GLES 1 only has glBlendFunc */ #ifndef HAVE_COGL_GLES /* GLES 1 only has glBlendFunc */
if (have_blend_equation_seperate &&
material->blend_equation_rgb != material->blend_equation_alpha)
GE (glBlendEquationSeparate (material->blend_equation_rgb,
material->blend_equation_alpha));
else
GE (glBlendEquation (material->blend_equation_rgb));
if (blend_factor_uses_constant (material->blend_src_factor_rgb) || if (blend_factor_uses_constant (material->blend_src_factor_rgb) ||
blend_factor_uses_constant (material->blend_src_factor_alpha) || blend_factor_uses_constant (material->blend_src_factor_alpha) ||
blend_factor_uses_constant (material->blend_dst_factor_rgb) || blend_factor_uses_constant (material->blend_dst_factor_rgb) ||
@ -1723,23 +1730,14 @@ _cogl_material_flush_base_gl_state (CoglMaterial *material,
(material->blend_src_factor_rgb != material->blend_src_factor_alpha || (material->blend_src_factor_rgb != material->blend_src_factor_alpha ||
(material->blend_src_factor_rgb != (material->blend_src_factor_rgb !=
material->blend_src_factor_alpha))) material->blend_src_factor_alpha)))
{ GE (glBlendFuncSeparate (material->blend_src_factor_rgb,
if (have_blend_equation_seperate && material->blend_dst_factor_rgb,
material->blend_equation_rgb != material->blend_equation_alpha) material->blend_src_factor_alpha,
GE (glBlendEquationSeparate (material->blend_equation_rgb, material->blend_dst_factor_alpha));
material->blend_equation_alpha));
else
GE (glBlendEquation (material->blend_equation_rgb));
GE (glBlendFuncSeparate (material->blend_src_factor_rgb,
material->blend_dst_factor_rgb,
material->blend_src_factor_alpha,
material->blend_dst_factor_alpha));
}
else else
#endif #endif
GE (glBlendFunc (material->blend_src_factor_rgb, GE (glBlendFunc (material->blend_src_factor_rgb,
material->blend_dst_factor_rgb)); material->blend_dst_factor_rgb));
} }
} }