From ab4d2d447afe749ddb6570d1d1ee7b353d5a54f9 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 4 Mar 2025 12:45:14 +0100 Subject: [PATCH] radv: remove redundant radv_instance::drirc::rt_wave64 Use RADV_PERFTEST_RT_WAVE_64 instead. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_instance.c | 3 ++- src/amd/vulkan/radv_instance.h | 1 - src/amd/vulkan/radv_physical_device.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c index da587e1fba4..05f9bbfe455 100644 --- a/src/amd/vulkan/radv_instance.c +++ b/src/amd/vulkan/radv_instance.c @@ -256,7 +256,8 @@ radv_init_dri_options(struct radv_instance *instance) instance->drirc.flush_before_timestamp_write = driQueryOptionb(&instance->drirc.options, "radv_flush_before_timestamp_write"); - instance->drirc.force_rt_wave64 = driQueryOptionb(&instance->drirc.options, "radv_rt_wave64"); + if (driQueryOptionb(&instance->drirc.options, "radv_rt_wave64")) + instance->perftest_flags |= RADV_PERFTEST_RT_WAVE_64; instance->drirc.disable_dedicated_sparse_queue = driQueryOptionb(&instance->drirc.options, "radv_disable_dedicated_sparse_queue"); diff --git a/src/amd/vulkan/radv_instance.h b/src/amd/vulkan/radv_instance.h index d94d7fed3e6..f8535e050cb 100644 --- a/src/amd/vulkan/radv_instance.h +++ b/src/amd/vulkan/radv_instance.h @@ -63,7 +63,6 @@ struct radv_instance { bool tex_non_uniform; bool ssbo_non_uniform; bool flush_before_timestamp_write; - bool force_rt_wave64; bool disable_dedicated_sparse_queue; bool force_pstate_peak_gfx11_dgpu; bool clear_lds; diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c index bfaacd3115b..43eb4d8dd72 100644 --- a/src/amd/vulkan/radv_physical_device.c +++ b/src/amd/vulkan/radv_physical_device.c @@ -2199,7 +2199,7 @@ radv_physical_device_try_create(struct radv_instance *instance, drmDevicePtr drm if (instance->perftest_flags & RADV_PERFTEST_RT_WAVE_32 || pdev->info.gfx_level < GFX11) pdev->rt_wave_size = 32; - if (instance->perftest_flags & RADV_PERFTEST_RT_WAVE_64 || instance->drirc.force_rt_wave64) + if (instance->perftest_flags & RADV_PERFTEST_RT_WAVE_64) pdev->rt_wave_size = 64; }