diff options
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/genX_state_upload.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index ae4cdedd560..67b83ac9ca9 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -978,7 +978,8 @@ gen4_update_renderbuffer_surface(struct brw_context *brw, if (devinfo->gen < 6) { /* _NEW_COLOR */ - if (!ctx->Color.ColorLogicOpEnabled && !ctx->Color._AdvancedBlendMode && + if (!ctx->Color.ColorLogicOpEnabled && + ctx->Color._AdvancedBlendMode == BLEND_NONE && (ctx->Color.BlendEnabled & (1 << unit))) surf[0] |= BRW_SURFACE_BLEND_ENABLED; diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c index 153e2532d41..d3508eb5460 100644 --- a/src/mesa/drivers/dri/i965/genX_state_upload.c +++ b/src/mesa/drivers/dri/i965/genX_state_upload.c @@ -2843,7 +2843,8 @@ set_blend_entry_bits(struct brw_context *brw, BLEND_ENTRY_GENXML *entry, int i, entry->LogicOpEnable = true; entry->LogicOpFunction = ctx->Color._LogicOp; } - } else if (blend_enabled && !ctx->Color._AdvancedBlendMode + } else if (blend_enabled && + ctx->Color._AdvancedBlendMode == BLEND_NONE && (GEN_GEN <= 5 || !integer)) { GLenum eqRGB = ctx->Color.Blend[i].EquationRGB; GLenum eqA = ctx->Color.Blend[i].EquationA; |