From 680f7afe0b8e200d4eb775da7f7c825ca0e5344c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 6 Nov 2024 20:32:23 -0500 Subject: [PATCH] radeonsi: don't use nir_io_dont_optimize because it's deprecated There is a new environment variable that can be used instead. Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_debug_options.h | 1 - src/gallium/drivers/radeonsi/si_get.c | 3 +-- src/gallium/drivers/radeonsi/si_state_shaders.cpp | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_debug_options.h b/src/gallium/drivers/radeonsi/si_debug_options.h index ba2c2336ee0..f645d34030c 100644 --- a/src/gallium/drivers/radeonsi/si_debug_options.h +++ b/src/gallium/drivers/radeonsi/si_debug_options.h @@ -22,7 +22,6 @@ OPT_BOOL(dcc_msaa, true, "Enable DCC for MSAA for GFX10-10.3") OPT_BOOL(zerovram, false, "Zero all VRAM allocations") OPT_BOOL(clear_lds, false, "Clear LDS at the end of shaders. Might decrease performance.") OPT_BOOL(cache_rb_gl2, false, "Enable GL2 caching for CB and DB.") -OPT_BOOL(optimize_io, true, "Run nir_opt_varyings in the GLSL linker.") #undef OPT_BOOL #undef OPT_INT diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c index e2b3f469c7c..25afcbfa3dc 100644 --- a/src/gallium/drivers/radeonsi/si_get.c +++ b/src/gallium/drivers/radeonsi/si_get.c @@ -1576,8 +1576,7 @@ void si_init_screen_get_functions(struct si_screen *sscreen) * when execution mode is rtz instead of rtne. */ options->force_f2f16_rtz = true; - options->io_options |= (!has_mediump ? nir_io_mediump_is_32bit : 0) | nir_io_has_intrinsics | - (sscreen->options.optimize_io ? 0 : nir_io_dont_optimize); + options->io_options |= (!has_mediump ? nir_io_mediump_is_32bit : 0) | nir_io_has_intrinsics; options->lower_mediump_io = has_mediump ? si_lower_mediump_io : NULL; /* HW supports indirect indexing for: | Enabled in driver * ------------------------------------------------------- diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.cpp b/src/gallium/drivers/radeonsi/si_state_shaders.cpp index 1535317ee71..4184823ee88 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.cpp +++ b/src/gallium/drivers/radeonsi/si_state_shaders.cpp @@ -147,8 +147,7 @@ void si_get_ir_cache_key(struct si_shader_selector *sel, bool ngg, bool es, /* bit gap */ if (wave_size == 32) shader_variant_flags |= 1 << 2; - if (sel->screen->options.optimize_io) - shader_variant_flags |= 1 << 3; + /* bit gap */ /* use_ngg_culling disables NGG passthrough for non-culling shaders to reduce context * rolls, which can be changed with AMD_DEBUG=nonggc or AMD_DEBUG=nggc. */