OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ac/nir: Rename emit_streamout to ac_nir_emit_legacy_streamout

Browse Source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32966>
This commit is contained in:
Timur Kristóf
2025-01-09 16:39:10 -06:00
parent 015e5080e9
commit 4cad0bc438
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/amd/common/ac_nir.c
View File

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

6
src/amd/common/ac_nir_helpers.h
View File

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