Module: Mesa Branch: main Commit: 8760b7fab71fb59d5abef9796c31e60d7081409a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8760b7fab71fb59d5abef9796c31e60d7081409a
Author: Samuel Pitoiset <samuel.pitoi...@gmail.com> Date: Wed Dec 13 10:57:12 2023 +0100 radv: cleanup radv_pipeline_generate_ps_epilog_key() This has no effects because key->spi_shader_col_format isn't used when the graphics pipeline needs to compile a PS epilog. Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26663> --- src/amd/vulkan/radv_pipeline_graphics.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/amd/vulkan/radv_pipeline_graphics.c b/src/amd/vulkan/radv_pipeline_graphics.c index 4d67f1e74dd..5dbc75fad9c 100644 --- a/src/amd/vulkan/radv_pipeline_graphics.c +++ b/src/amd/vulkan/radv_pipeline_graphics.c @@ -1752,8 +1752,7 @@ radv_generate_ps_epilog_key(const struct radv_device *device, const struct radv_ } static struct radv_ps_epilog_key -radv_pipeline_generate_ps_epilog_key(const struct radv_device *device, const struct vk_graphics_pipeline_state *state, - bool disable_mrt_compaction) +radv_pipeline_generate_ps_epilog_key(const struct radv_device *device, const struct vk_graphics_pipeline_state *state) { struct radv_ps_epilog_state ps_epilog = {0}; @@ -1806,7 +1805,7 @@ radv_pipeline_generate_ps_epilog_key(const struct radv_device *device, const str } } - return radv_generate_ps_epilog_key(device, &ps_epilog, disable_mrt_compaction); + return radv_generate_ps_epilog_key(device, &ps_epilog, false); } static struct radv_pipeline_key @@ -1933,10 +1932,7 @@ radv_generate_graphics_pipeline_key(const struct radv_device *device, const stru if (radv_pipeline_needs_ps_epilog(pipeline, lib_flags)) key.ps.has_epilog = true; - /* Disable MRT compaction when a PS epilog is needed because we don't know the fragment output - * interface. - */ - key.ps.epilog = radv_pipeline_generate_ps_epilog_key(device, state, key.ps.has_epilog); + key.ps.epilog = radv_pipeline_generate_ps_epilog_key(device, state); if (device->physical_device->rad_info.gfx_level >= GFX11) { /* On GFX11, alpha to coverage is exported via MRTZ when depth/stencil/samplemask are also
