From 67c9497435c1a557e5313d58b26a6b45818479d1 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 8 Dec 2022 13:55:09 +0100 Subject: [PATCH] radv: fix PS epilogs with RADV_PERFTEST=pswave32 This option is rarely or even never used but it was broken. While we are at it, remove radv_ps_epilog_key::wave32 because the wave size can only be changed globally for PS. Signed-off-by: Samuel Pitoiset Reviewed-by: Rhys Perry Part-of: --- src/amd/vulkan/radv_shader.c | 2 +- src/amd/vulkan/radv_shader.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 300fe904c15..4bf5a551d84 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -2643,7 +2643,7 @@ radv_create_ps_epilog(struct radv_device *device, const struct radv_ps_epilog_ke device->instance->debug_flags & RADV_DEBUG_HANG, false); struct radv_shader_info info = {0}; - info.wave_size = key->wave32 ? 32 : 64; + info.wave_size = device->physical_device->ps_wave_size; info.workgroup_size = 64; radv_declare_ps_epilog_args(device->physical_device->rad_info.gfx_level, key, &args); diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h index b91a3561425..b21332dec2a 100644 --- a/src/amd/vulkan/radv_shader.h +++ b/src/amd/vulkan/radv_shader.h @@ -415,7 +415,6 @@ struct radv_ps_epilog_key { uint8_t enable_mrt_output_nan_fixup; bool mrt0_is_dual_src; - bool wave32; }; enum radv_shader_binary_type { RADV_BINARY_TYPE_LEGACY, RADV_BINARY_TYPE_RTLD };