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

radeonsi: use the same units for esgs_ring_size and ngg_emit_size

Browse source 
for consistency

Fixes: a23802bcb9 - ac,radeonsi: start adding support for gfx10.3

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6137>
This commit is contained in:
Marek Olšák 2020-07-30 08:04:28 -04:00
parent b6fb09fd84
commit 633d2aa915
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2061,7 +2061,7 @@ retry_select_mode:
shader->ngg.prim_amp_factor = prim_amp_factor;
shader->ngg.max_vert_out_per_gs_instance = max_vert_out_per_gs_instance;
shader->gs_info.esgs_ring_size = 4 * max_esverts * esvert_lds_size;
shader->gs_info.esgs_ring_size = max_esverts * esvert_lds_size;
shader->ngg.ngg_emit_size = max_gsprims * gsprim_lds_size;
assert(shader->ngg.hw_max_esverts >= 24); /* HW limitation */

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

@ -816,7 +816,7 @@ static bool si_shader_binary_open(struct si_screen *screen, struct si_shader *sh
*/
struct ac_rtld_symbol *sym = &lds_symbols[num_lds_symbols++];
sym->name = "esgs_ring";
sym->size = shader->gs_info.esgs_ring_size;
sym->size = shader->gs_info.esgs_ring_size * 4;
sym->align = 64 * 1024;
}

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

@ -703,7 +703,7 @@ void gfx9_get_gs_info(struct si_shader_selector *es, struct si_shader_selector *
out->gs_prims_per_subgroup = gs_prims;
out->gs_inst_prims_in_subgroup = gs_prims * gs_num_invocations;
out->max_prims_per_subgroup = out->gs_inst_prims_in_subgroup * gs->gs_max_out_vertices;
out->esgs_ring_size = 4 * esgs_lds_size;
out->esgs_ring_size = esgs_lds_size;
assert(out->max_prims_per_subgroup <= max_out_prims);
}