From dc5e0e2b73e0a533b8c1bbf1834ef5b6bd9de8e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 11 Apr 2025 16:32:31 -0400 Subject: [PATCH] radeonsi: rename num_stream_output_components -> num_gs_stream_components it's not for streamout Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_nir_lower_abi.c | 2 +- src/gallium/drivers/radeonsi/si_shader.h | 2 +- src/gallium/drivers/radeonsi/si_shader_info.c | 2 +- src/gallium/drivers/radeonsi/si_state_shaders.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_abi.c b/src/gallium/drivers/radeonsi/si_nir_lower_abi.c index 88353c1800b..3bf567aa9cb 100644 --- a/src/gallium/drivers/radeonsi/si_nir_lower_abi.c +++ b/src/gallium/drivers/radeonsi/si_nir_lower_abi.c @@ -127,7 +127,7 @@ static bool build_gsvs_ring_desc(nir_builder *b, struct lower_abi_state *s) */ for (unsigned stream = 0; stream < 4; stream++) { - unsigned num_components = sel->info.num_stream_output_components[stream]; + unsigned num_components = sel->info.num_gs_stream_components[stream]; if (!num_components) continue; diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index 23d8094e3cb..c46bf021ebd 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -481,7 +481,7 @@ struct si_shader_info { uint8_t num_vs_inputs; uint8_t num_vbos_in_user_sgprs; - uint8_t num_stream_output_components[4]; /* for GS streams, not streamout */ + uint8_t num_gs_stream_components[4]; uint16_t enabled_streamout_buffer_mask; uint64_t inputs_read; /* "get_unique_index" bits */ diff --git a/src/gallium/drivers/radeonsi/si_shader_info.c b/src/gallium/drivers/radeonsi/si_shader_info.c index 8ebd048ef8a..6473a6d8d97 100644 --- a/src/gallium/drivers/radeonsi/si_shader_info.c +++ b/src/gallium/drivers/radeonsi/si_shader_info.c @@ -173,7 +173,7 @@ static void scan_io_usage(const nir_shader *nir, struct si_shader_info *info, if (new_mask & (1 << i)) { info->output_streams[loc] |= stream << (i * 2); - info->num_stream_output_components[stream]++; + info->num_gs_stream_components[stream]++; } } diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.cpp b/src/gallium/drivers/radeonsi/si_state_shaders.cpp index 37068b82460..38ce5965f40 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.cpp +++ b/src/gallium/drivers/radeonsi/si_state_shaders.cpp @@ -1030,7 +1030,7 @@ static void si_emit_shader_gs(struct si_context *sctx, unsigned index) static void si_shader_gs(struct si_screen *sscreen, struct si_shader *shader) { struct si_shader_selector *sel = shader->selector; - const uint8_t *num_components = sel->info.num_stream_output_components; + const uint8_t *num_components = sel->info.num_gs_stream_components; unsigned gs_num_invocations = sel->info.base.gs.invocations; struct si_pm4_state *pm4; uint64_t va; @@ -3671,7 +3671,7 @@ static void *si_create_shader_selector(struct pipe_context *ctx, !sel->nir->info.writes_memory && /* NGG GS supports culling with streamout because it culls after streamout. */ (sel->stage == MESA_SHADER_GEOMETRY || !sel->info.enabled_streamout_buffer_mask) && - (sel->stage != MESA_SHADER_GEOMETRY || sel->info.num_stream_output_components[0]) && + (sel->stage != MESA_SHADER_GEOMETRY || sel->info.num_gs_stream_components[0]) && (sel->stage != MESA_SHADER_VERTEX || (!sel->nir->info.vs.blit_sgprs_amd && !sel->nir->info.vs.window_space_position));