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

opengl: Fix conditional call of BlendFuncSeparate

Browse Source 
Checking whether src_rgb != src_alpha twice is pointless; not checking
whether dst_rgb != dst_alpha is clearly wrong.

Found by Coverity.

Signed-off-by: Adam Jackson <ajax@redhat.com>

https://bugzilla.gnome.org/show_bug.cgi?id=689850

Reviewed-by: Neil Roberts <neil@linux.intel.com>

(cherry picked from commit fc292c25db3004543e277d92693ab9cb388d2121)
This commit is contained in:
Adam Jackson 2012-12-07 09:47:50 -05:00 committed by Neil Roberts
parent 491618a74c
commit f326401094
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-opengl.c
View File

@ -516,8 +516,8 @@ _cogl_pipeline_flush_color_blend_alpha_depth_state (
if (ctx->glBlendFuncSeparate && if (ctx->glBlendFuncSeparate &&
(blend_state->blend_src_factor_rgb != (blend_state->blend_src_factor_rgb !=
blend_state->blend_src_factor_alpha || blend_state->blend_src_factor_alpha ||
(blend_state->blend_src_factor_rgb != (blend_state->blend_dst_factor_rgb !=
blend_state->blend_src_factor_alpha))) blend_state->blend_dst_factor_alpha)))
GE (ctx, glBlendFuncSeparate (blend_state->blend_src_factor_rgb, GE (ctx, glBlendFuncSeparate (blend_state->blend_src_factor_rgb,
blend_state->blend_dst_factor_rgb, blend_state->blend_dst_factor_rgb,
blend_state->blend_src_factor_alpha, blend_state->blend_src_factor_alpha,