diff --git a/.pick_status.json b/.pick_status.json index df4dfd56538..d731fd8c85e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2504,7 +2504,7 @@ "description": "anv: disable dual source blending state if not used in shader", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/intel/vulkan/genX_gfx_state.c b/src/intel/vulkan/genX_gfx_state.c index df1d970282b..aebf85b2c24 100644 --- a/src/intel/vulkan/genX_gfx_state.c +++ b/src/intel/vulkan/genX_gfx_state.c @@ -292,6 +292,15 @@ genX(rasterization_mode)(VkPolygonMode raster_mode, } } +static bool +is_src1_blend_factor(enum GENX(3D_Color_Buffer_Blend_Factor) factor) +{ + return factor == BLENDFACTOR_SRC1_COLOR || + factor == BLENDFACTOR_SRC1_ALPHA || + factor == BLENDFACTOR_INV_SRC1_COLOR || + factor == BLENDFACTOR_INV_SRC1_ALPHA; +} + #if GFX_VERx10 == 125 /** * Return the dimensions of the current rendering area, defined as the @@ -998,6 +1007,16 @@ genX(cmd_buffer_flush_gfx_runtime_state)(struct anv_cmd_buffer *cmd_buffer) dyn->cb.attachments[i].dst_alpha_blend_factor]; } + /* Replace and Src1 value by 1.0 if dual source blending is not + * enabled. + */ + if (wm_prog_data && !wm_prog_data->dual_src_blend) { + if (is_src1_blend_factor(SourceBlendFactor)) + SourceBlendFactor = BLENDFACTOR_ONE; + if (is_src1_blend_factor(DestinationBlendFactor)) + DestinationBlendFactor = BLENDFACTOR_ONE; + } + if (instance->intel_enable_wa_14018912822 && intel_needs_workaround(cmd_buffer->device->info, 14018912822) && pipeline->rasterization_samples > 1) {