fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-15 06:40:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: eliminate unused shader outputs for separate NGG geometry shaders

Browse source 
This just works because the same output export code is used for VS too.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6634>
This commit is contained in:
Marek Olšák 2020-09-07 06:29:45 -04:00 • committed by Marge Bot
parent 5c445be39a
commit fc44861517
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1791,10 +1791,13 @@ static void si_shader_selector_key_hw_vs(struct si_context *sctx, struct si_shad
uint64_t linked = outputs_written & inputs_read;
key->opt.kill_outputs = ~linked & outputs_written;
key->opt.ngg_culling = sctx->ngg_culling;
if (sctx->ps_shader.cso && sctx->ps_shader.cso->info.uses_primid)
key->mono.u.vs_export_prim_id = 1;
if (vs->info.stage != MESA_SHADER_GEOMETRY) {
key->opt.ngg_culling = sctx->ngg_culling;
if (sctx->ps_shader.cso && sctx->ps_shader.cso->info.uses_primid)
key->mono.u.vs_export_prim_id = 1;
}
/* We need PKT3_CONTEXT_REG_RMW, which we currently only use on GFX10+. */
if (sctx->chip_class >= GFX10 &&
@ -1877,6 +1880,10 @@ static inline void si_shader_selector_key(struct pipe_context *ctx, struct si_sh
key->as_ngg = stages_key.u.ngg;
/* Only NGG can eliminate GS outputs, because the code is shared with VS. */
if (stages_key.u.ngg)
si_shader_selector_key_hw_vs(sctx, sel, key);
/* Merged ES-GS can have unbalanced wave usage.
*
* ES threads are per-vertex, while GS threads are