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

radv: remove unnecessary ac_nir_ngg_config output struct

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13134>
This commit is contained in:
Samuel Pitoiset 2021-10-01 10:00:25 +02:00 • committed by Marge Bot
parent 52e91f7640
commit b52aaea630
3 changed files with 15 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/amd/common/ac_nir.h
View file

@ -91,13 +91,7 @@ bool
ac_nir_lower_indirect_derefs(nir_shader *shader,
enum chip_class chip_class);
typedef struct
{
uint64_t nggc_inputs_read_by_pos;
uint64_t nggc_inputs_read_by_others;
} ac_nir_ngg_config;
ac_nir_ngg_config
void
ac_nir_lower_ngg_nogs(nir_shader *shader,
unsigned max_num_es_vertices,
unsigned num_vertices_per_primitive,

9
src/amd/common/ac_nir_lower_ngg.c
View file

@ -1254,7 +1254,7 @@ add_deferred_attribute_culling(nir_builder *b, nir_cf_list *original_extracted_c
unreachable("Should be VS or TES.");
}
ac_nir_ngg_config
void
ac_nir_lower_ngg_nogs(nir_shader *shader,
unsigned max_num_es_vertices,
unsigned num_vertices_per_primitives,
@ -1411,13 +1411,6 @@ ac_nir_lower_ngg_nogs(nir_shader *shader,
} while (progress);
shader->info.shared_size = state.total_lds_bytes;
ac_nir_ngg_config ret = {
.nggc_inputs_read_by_pos = state.inputs_needed_by_pos,
.nggc_inputs_read_by_others = state.inputs_needed_by_others,
};
return ret;
}
static nir_ssa_def *

28
src/amd/vulkan/radv_shader.c
View file

@ -953,7 +953,6 @@ void radv_lower_ngg(struct radv_device *device, struct nir_shader *nir,
nir->info.stage == MESA_SHADER_TESS_EVAL ||
nir->info.stage == MESA_SHADER_GEOMETRY);
ac_nir_ngg_config out_conf = {0};
const struct gfx10_ngg_info *ngg_info = &info->ngg_info;
unsigned num_vertices_per_prim = 3;
@ -1000,20 +999,19 @@ void radv_lower_ngg(struct radv_device *device, struct nir_shader *nir,
export_prim_id = info->tes.outinfo.export_prim_id;
}
out_conf =
ac_nir_lower_ngg_nogs(
nir,
max_vtx_in,
num_vertices_per_prim,
info->workgroup_size,
info->wave_size,
info->has_ngg_culling,
info->has_ngg_early_prim_export,
info->is_ngg_passthrough,
export_prim_id,
pl_key->vs.provoking_vtx_last,
false,
pl_key->vs.instance_rate_inputs);
ac_nir_lower_ngg_nogs(
nir,
max_vtx_in,
num_vertices_per_prim,
info->workgroup_size,
info->wave_size,
info->has_ngg_culling,
info->has_ngg_early_prim_export,
info->is_ngg_passthrough,
export_prim_id,
pl_key->vs.provoking_vtx_last,
false,
pl_key->vs.instance_rate_inputs);
} else if (nir->info.stage == MESA_SHADER_GEOMETRY) {
assert(info->is_ngg);
ac_nir_lower_ngg_gs(