From 3f23421dc552d487d7ee147f83939f5eebbaf33d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sat, 22 Nov 2025 22:17:48 -0500 Subject: [PATCH] radeonsi: remove si_shader_selector::*_descriptors_index fields They are trivial to compute. Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_compute.c | 4 ---- src/gallium/drivers/radeonsi/si_descriptors.c | 4 ++-- src/gallium/drivers/radeonsi/si_shader.h | 2 -- src/gallium/drivers/radeonsi/si_state_shaders.cpp | 4 ---- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index 779cfce4b56..6c132e72b67 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -119,10 +119,6 @@ void *si_create_compute_state_for_nir(struct pipe_context *ctx, nir_shader *nir, sel->stage = stage; sel->screen = sscreen; simple_mtx_init(&sel->mutex, mtx_plain); - sel->const_and_shader_buf_descriptors_index = - si_const_and_shader_buffer_descriptors_idx(stage); - sel->sampler_and_images_descriptors_index = - si_sampler_and_image_descriptors_idx(stage); program->shader.selector = &program->sel; sel->nir = nir; diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 775c43cd4fa..128ce6c0fd9 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -3217,8 +3217,8 @@ void si_set_active_descriptors_for_shader(struct si_context *sctx, struct si_sha if (!sel) return; - si_set_active_descriptors(sctx, sel->const_and_shader_buf_descriptors_index, + si_set_active_descriptors(sctx, si_const_and_shader_buffer_descriptors_idx(sel->stage), sel->active_const_and_shader_buffers); - si_set_active_descriptors(sctx, sel->sampler_and_images_descriptors_index, + si_set_active_descriptors(sctx, si_sampler_and_image_descriptors_idx(sel->stage), sel->active_samplers_and_images); } diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index 6626ef2c832..0b7d5e04fcb 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -496,8 +496,6 @@ struct si_shader_selector { struct si_shader_info info; - uint8_t const_and_shader_buf_descriptors_index; - uint8_t sampler_and_images_descriptors_index; unsigned ngg_cull_vert_threshold; /* UINT32_MAX = disabled */ enum mesa_prim rast_prim; diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.cpp b/src/gallium/drivers/radeonsi/si_state_shaders.cpp index 17cd0d96f52..b5ca9730029 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.cpp +++ b/src/gallium/drivers/radeonsi/si_state_shaders.cpp @@ -3600,10 +3600,6 @@ static void *si_create_shader_selector(struct pipe_context *ctx, si_nir_gather_info(sscreen, sel->nir, &sel->info, false); sel->stage = sel->nir->info.stage; - sel->const_and_shader_buf_descriptors_index = - si_const_and_shader_buffer_descriptors_idx(sel->stage); - sel->sampler_and_images_descriptors_index = - si_sampler_and_image_descriptors_idx(sel->stage); if (si_can_dump_shader(sscreen, sel->stage, SI_DUMP_INIT_NIR)) nir_print_shader(sel->nir, stderr);