fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radeonsi: rename num_stream_output_components -> num_gs_stream_components

Browse source 
it's not for streamout

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34492>
This commit is contained in:
Marek Olšák 2025-04-11 16:32:31 -04:00 • committed by Marge Bot
parent 54cc89f7c2
commit dc5e0e2b73
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/radeonsi/si_nir_lower_abi.c
View file

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

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

@ -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 */

2
src/gallium/drivers/radeonsi/si_shader_info.c
View file

@ -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]++;
}
}

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

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