fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-27 08:50:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: clamp vertex color in legacy gs instead of gs copy shader

Browse source 
gs copy shader is going to emit nir_export_amd directly so this vertex
color clamp pass which apply to nir_store_output will not work.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20691>
This commit is contained in:
Qiang Yu 2023-01-28 10:17:38 +08:00 • committed by Marge Bot
parent 601ad9e0a9
commit dcccd94faf
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1874,7 +1874,10 @@ struct nir_shader *si_get_nir_shader(struct si_shader *shader,
(sel->stage == MESA_SHADER_GEOMETRY && shader->key.ge.as_ngg)) &&
!shader->key.ge.as_ls && !shader->key.ge.as_es;
if (is_last_vgt_stage)
/* Legacy GS is not last VGT stage because it has GS copy shader. */
bool is_legacy_gs = sel->stage == MESA_SHADER_GEOMETRY && !key->ge.as_ngg;
if (is_last_vgt_stage || is_legacy_gs)
NIR_PASS(progress, nir, si_nir_clamp_vertex_color);
if (progress)
@ -1916,10 +1919,9 @@ struct nir_shader *si_get_nir_shader(struct si_shader *shader,
NIR_PASS_V(nir, ac_nir_lower_legacy_vs, primitive_id_location,
key->ge.opt.remove_streamout);
}
}
if (sel->stage == MESA_SHADER_GEOMETRY && !key->ge.as_ngg)
} else if (is_legacy_gs) {
NIR_PASS_V(nir, ac_nir_lower_legacy_gs, false, sel->screen->use_ngg, output_info);
}
NIR_PASS(progress2, nir, si_nir_lower_abi, shader, args);
@ -2012,11 +2014,6 @@ si_nir_generate_gs_copy_shader(struct si_screen *sscreen,
gskey->ge.opt.remove_streamout,
output_info);
/* used in si_nir_clamp_vertex_color */
nir->info.outputs_written = gsinfo->base.outputs_written;
nir->info.outputs_written_16bit = gsinfo->base.outputs_written_16bit;
NIR_PASS_V(nir, si_nir_clamp_vertex_color);
struct si_shader_args args;
si_init_shader_args(shader, &args);