fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-25 21:00:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: remove si_shader_selector::*_descriptors_index fields

Browse source 
They are trivial to compute.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38802>
This commit is contained in:
Marek Olšák 2025-11-22 22:17:48 -05:00 • committed by Marge Bot
parent f00f054087
commit 3f23421dc5
4 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/radeonsi/si_compute.c
View file

@ -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;

4
src/gallium/drivers/radeonsi/si_descriptors.c
View file

@ -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);
}

2
src/gallium/drivers/radeonsi/si_shader.h
View file

@ -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;

4
src/gallium/drivers/radeonsi/si_state_shaders.cpp
View file

@ -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);