From 687510495fe391f5193bde7d894e1825c1e8133b Mon Sep 17 00:00:00 2001 From: Georg Lehmann Date: Wed, 3 Sep 2025 09:48:26 +0200 Subject: [PATCH] nir: remove subgroup size related nir_shader_compiler_options members This was added with the goal to eventually replace the per pass subgroup/ballot size options, but that won't work because some backends don't have a fixed subgroup size across the compilation process. It was also mostly added to hack around mesa state tracker behavior, and we have a better solution there now. Reviewed-by: Alyssa Rosenzweig Reviewed-by: Emma Anholt Part-of: --- src/asahi/compiler/agx_compile.h | 3 --- src/compiler/nir/nir_shader_compiler_options.h | 8 -------- 2 files changed, 11 deletions(-) diff --git a/src/asahi/compiler/agx_compile.h b/src/asahi/compiler/agx_compile.h index 7c92254de2d..659aee9490b 100644 --- a/src/asahi/compiler/agx_compile.h +++ b/src/asahi/compiler/agx_compile.h @@ -406,7 +406,4 @@ static const nir_shader_compiler_options agx_nir_options = { .discard_is_demote = true, .scalarize_ddx = true, .io_options = nir_io_always_interpolate_convergent_fs_inputs, - .subgroup_size = 32, - .ballot_bit_size = 32, - .ballot_components = 1, }; diff --git a/src/compiler/nir/nir_shader_compiler_options.h b/src/compiler/nir/nir_shader_compiler_options.h index 423a1f3b517..9b06d1ef02a 100644 --- a/src/compiler/nir/nir_shader_compiler_options.h +++ b/src/compiler/nir/nir_shader_compiler_options.h @@ -787,14 +787,6 @@ typedef struct nir_shader_compiler_options { */ unsigned skip_lower_packing_ops; - /* In case the exact subgroup size is not known, subgroup_size should be - * set to 0. In that case, the maximum subgroup size will be calculated by - * ballot_components * ballot_bit_size. - */ - uint8_t subgroup_size; - uint8_t ballot_bit_size; - uint8_t ballot_components; - /** Driver callback where drivers can define how to lower mediump. * Used by nir_lower_io_passes. */