From 4cad0bc438bf5edd3e77c5673a69218edd933c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Thu, 9 Jan 2025 16:39:10 -0600 Subject: [PATCH] ac/nir: Rename emit_streamout to ac_nir_emit_legacy_streamout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Part-of: --- src/amd/common/ac_nir.c | 8 ++++---- src/amd/common/ac_nir_helpers.h | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/amd/common/ac_nir.c b/src/amd/common/ac_nir.c index 6cf8a290b19..23cdb96fc71 100644 --- a/src/amd/common/ac_nir.c +++ b/src/amd/common/ac_nir.c @@ -1312,8 +1312,8 @@ get_output_and_type(ac_nir_prerast_out *out, unsigned slot, bool high_16bits, return data; } -static void -emit_streamout(nir_builder *b, unsigned stream, nir_xfb_info *info, ac_nir_prerast_out *out) +void +ac_nir_emit_legacy_streamout(nir_builder *b, unsigned stream, nir_xfb_info *info, ac_nir_prerast_out *out) { nir_def *so_vtx_count = nir_ubfe_imm(b, nir_load_streamout_config_amd(b), 16, 7); nir_def *tid = nir_load_subgroup_invocation(b); @@ -1500,7 +1500,7 @@ ac_nir_create_gs_copy_shader(const nir_shader *gs_nir, } if (stream_id) - emit_streamout(&b, stream, info, &out); + ac_nir_emit_legacy_streamout(&b, stream, info, &out); if (stream == 0) { uint64_t export_outputs = b.shader->info.outputs_written | VARYING_BIT_POS; @@ -1587,7 +1587,7 @@ ac_nir_lower_legacy_vs(nir_shader *nir, } if (!disable_streamout && nir->xfb_info) { - emit_streamout(&b, 0, ac_nir_get_sorted_xfb_info(nir), &out); + ac_nir_emit_legacy_streamout(&b, 0, ac_nir_get_sorted_xfb_info(nir), &out); preserved = nir_metadata_none; } diff --git a/src/amd/common/ac_nir_helpers.h b/src/amd/common/ac_nir_helpers.h index 53ca009beca..7b741901cd7 100644 --- a/src/amd/common/ac_nir_helpers.h +++ b/src/amd/common/ac_nir_helpers.h @@ -80,6 +80,9 @@ typedef unsigned (*ac_nir_map_io_driver_location)(unsigned semantic); struct nir_builder; typedef struct nir_builder nir_builder; +struct nir_xfb_info; +typedef struct nir_xfb_info nir_xfb_info; + /* Executed by ac_nir_cull when the current primitive is accepted. */ typedef void (*ac_nir_cull_accepted)(nir_builder *b, void *state); @@ -155,6 +158,9 @@ ac_optimization_barrier_vgpr_array(const struct radeon_info *info, nir_builder * nir_def * ac_get_global_ids(nir_builder *b, unsigned num_components, unsigned bit_size); +void +ac_nir_emit_legacy_streamout(nir_builder *b, unsigned stream, nir_xfb_info *info, ac_nir_prerast_out *out); + #ifdef __cplusplus } #endif