AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Disable hardware blending if advanced blending is in use.

Browse Source 
We'll do blending in the shader in this case, so just disable the
hardware blending.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
This commit is contained in:
Kenneth Graunke
2016-06-28 08:24:11 -07:00
parent 8ab50f5dd1
commit 40241d40d0
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/brw_cc.c
+1 -1
View File
@@ -159,7 +159,7 @@ static void upload_cc_unit(struct brw_context *brw)
if (ctx->Color.ColorLogicOpEnabled && ctx->Color.LogicOp != GL_COPY) {
cc->cc2.logicop_enable = 1;
cc->cc5.logicop_func = intel_translate_logic_op(ctx->Color.LogicOp);
} else if (ctx->Color.BlendEnabled) {
} else if (ctx->Color.BlendEnabled && !ctx->Color._AdvancedBlendMode) {
GLenum eqRGB = ctx->Color.Blend[0].EquationRGB;
GLenum eqA = ctx->Color.Blend[0].EquationA;
GLenum srcRGB = ctx->Color.Blend[0].SrcRGB;
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+2 -2
View File
@@ -926,8 +926,8 @@ gen4_update_renderbuffer_surface(struct brw_context *brw,
if (brw->gen < 6) {
/* _NEW_COLOR */
if (!ctx->Color.ColorLogicOpEnabled &&
(ctx->Color.BlendEnabled & (1 << unit)))
if (!ctx->Color.ColorLogicOpEnabled && !ctx->Color._AdvancedBlendMode &&
(ctx->Color.BlendEnabled & (1 << unit)))
surf[0] |= BRW_SURFACE_BLEND_ENABLED;
if (!ctx->Color.ColorMask[unit][0])
src/mesa/drivers/dri/i965/gen6_cc.c
+2 -1
View File
@@ -104,7 +104,8 @@ gen6_upload_blend_state(struct brw_context *brw)
blend[b].blend1.logic_op_func =
intel_translate_logic_op(ctx->Color.LogicOp);
}
} else if (ctx->Color.BlendEnabled & (1 << b) && !integer) {
} else if (ctx->Color.BlendEnabled & (1 << b) && !integer &&
!ctx->Color._AdvancedBlendMode) {
GLenum eqRGB = ctx->Color.Blend[b].EquationRGB;
GLenum eqA = ctx->Color.Blend[b].EquationA;
GLenum srcRGB = ctx->Color.Blend[b].SrcRGB;
src/mesa/drivers/dri/i965/gen8_blend_state.c
+2 -1
View File
@@ -107,7 +107,8 @@ gen8_upload_blend_state(struct brw_context *brw)
GEN8_BLEND_LOGIC_OP_ENABLE |
SET_FIELD(intel_translate_logic_op(ctx->Color.LogicOp),
GEN8_BLEND_LOGIC_OP_FUNCTION);
} else if (ctx->Color.BlendEnabled & (1 << i) && !integer) {
} else if (ctx->Color.BlendEnabled & (1 << i) && !integer &&
!ctx->Color._AdvancedBlendMode) {
GLenum eqRGB = ctx->Color.Blend[i].EquationRGB;
GLenum eqA = ctx->Color.Blend[i].EquationA;
GLenum srcRGB = ctx->Color.Blend[i].SrcRGB;