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

radeonsi/gfx10: disable vertex grouping

Browse source 
based on PAL.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
This commit is contained in:
Marek Olšák 2019-10-28 16:37:53 -04:00
parent 75ce078a0a
commit 42f921387b
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gallium/drivers/radeonsi/si_state_draw.c
View file

@ -724,25 +724,22 @@ static void gfx10_emit_ge_cntl(struct si_context *sctx, unsigned num_patches)
if (sctx->ngg) { if (sctx->ngg) {
if (sctx->tes_shader.cso) { if (sctx->tes_shader.cso) {
ge_cntl = S_03096C_PRIM_GRP_SIZE(num_patches) | ge_cntl = S_03096C_PRIM_GRP_SIZE(num_patches) |
S_03096C_VERT_GRP_SIZE(0) | S_03096C_VERT_GRP_SIZE(256) | /* 256 = disable vertex grouping */
S_03096C_BREAK_WAVE_AT_EOI(key.u.tess_uses_prim_id); S_03096C_BREAK_WAVE_AT_EOI(key.u.tess_uses_prim_id);
} else { } else {
ge_cntl = si_get_vs_state(sctx)->ge_cntl; ge_cntl = si_get_vs_state(sctx)->ge_cntl;
} }
} else { } else {
unsigned primgroup_size; unsigned primgroup_size;
unsigned vertgroup_size; unsigned vertgroup_size = 256; /* 256 = disable vertex grouping */;
if (sctx->tes_shader.cso) { if (sctx->tes_shader.cso) {
primgroup_size = num_patches; /* must be a multiple of NUM_PATCHES */ primgroup_size = num_patches; /* must be a multiple of NUM_PATCHES */
vertgroup_size = 0;
} else if (sctx->gs_shader.cso) { } else if (sctx->gs_shader.cso) {
unsigned vgt_gs_onchip_cntl = sctx->gs_shader.current->ctx_reg.gs.vgt_gs_onchip_cntl; unsigned vgt_gs_onchip_cntl = sctx->gs_shader.current->ctx_reg.gs.vgt_gs_onchip_cntl;
primgroup_size = G_028A44_GS_PRIMS_PER_SUBGRP(vgt_gs_onchip_cntl); primgroup_size = G_028A44_GS_PRIMS_PER_SUBGRP(vgt_gs_onchip_cntl);
vertgroup_size = G_028A44_ES_VERTS_PER_SUBGRP(vgt_gs_onchip_cntl);
} else { } else {
primgroup_size = 128; /* recommended without a GS and tess */ primgroup_size = 128; /* recommended without a GS and tess */
vertgroup_size = 0;
} }
ge_cntl = S_03096C_PRIM_GRP_SIZE(primgroup_size) | ge_cntl = S_03096C_PRIM_GRP_SIZE(primgroup_size) |

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

@ -1240,7 +1240,7 @@ static void gfx10_shader_ngg(struct si_screen *sscreen, struct si_shader *shader
shader->ge_cntl = shader->ge_cntl =
S_03096C_PRIM_GRP_SIZE(shader->ngg.max_gsprims) | S_03096C_PRIM_GRP_SIZE(shader->ngg.max_gsprims) |
S_03096C_VERT_GRP_SIZE(shader->ngg.hw_max_esverts) | S_03096C_VERT_GRP_SIZE(256) | /* 256 = disable vertex grouping */
S_03096C_BREAK_WAVE_AT_EOI(break_wave_at_eoi); S_03096C_BREAK_WAVE_AT_EOI(break_wave_at_eoi);
/* Bug workaround for a possible hang with non-tessellation cases. /* Bug workaround for a possible hang with non-tessellation cases.