diff --git a/.pick_status.json b/.pick_status.json index bb42ba9dde9..3650566d4c0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -674,7 +674,7 @@ "description": "radv: do not clear unwritten color attachments with dual-source blending", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "e1483d022b28218bd53aea1c4917739cf0398b3e", "notes": null diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c index 2f8e99d2990..0513e55b3fa 100644 --- a/src/amd/vulkan/radv_shader_info.c +++ b/src/amd/vulkan/radv_shader_info.c @@ -997,7 +997,8 @@ gather_shader_info_fs(const struct radv_device *device, const nir_shader *nir, info->ps.spi_shader_col_format = gfx_state->ps.epilog.spi_shader_col_format; /* Clear color attachments that aren't exported by the FS to match IO shader arguments. */ - info->ps.spi_shader_col_format &= info->ps.colors_written; + if (!info->ps.mrt0_is_dual_src) + info->ps.spi_shader_col_format &= info->ps.colors_written; info->ps.cb_shader_mask = ac_get_cb_shader_mask(info->ps.spi_shader_col_format); }