diff options
author | marha <marha@users.sourceforge.net> | 2011-09-20 10:51:44 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-09-20 10:51:44 +0200 |
commit | 5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1 (patch) | |
tree | b7206e85fd135f1cf45c1db3ad85d3dc7c2fa2d3 /mesalib/src/mesa/state_tracker/st_atom_blend.c | |
parent | 97f357506241a5314de9071befcd01be731f1dbb (diff) | |
parent | 0470a59df89ab453bdbe0fc2f820278cfffdc61c (diff) | |
download | vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.gz vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.bz2 vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_atom_blend.c')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_blend.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_blend.c b/mesalib/src/mesa/state_tracker/st_atom_blend.c index 4c9a2b95a..1ffc2f1b7 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_blend.c +++ b/mesalib/src/mesa/state_tracker/st_atom_blend.c @@ -200,15 +200,7 @@ update_blend( struct st_context *st ) num_state = ctx->Const.MaxDrawBuffers; blend->independent_blend_enable = 1; } - /* Note it is impossible to correctly deal with EXT_blend_logic_op and - EXT_draw_buffers2/EXT_blend_equation_separate at the same time. - These combinations would require support for per-rt logicop enables - and separate alpha/rgb logicop/blend support respectively. Neither - possible in gallium nor most hardware. Assume these combinations - don't happen. */ - if (ctx->Color.ColorLogicOpEnabled || - (ctx->Color.BlendEnabled && - ctx->Color.Blend[0].EquationRGB == GL_LOGIC_OP)) { + if (ctx->Color.ColorLogicOpEnabled) { /* logicop enabled */ blend->logicop_enable = 1; blend->logicop_func = translate_logicop(ctx->Color.LogicOp); |