From e28e05ffe48e3bec1013fed8d28049bf8937c055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 30 Sep 2024 21:03:04 -0400 Subject: [PATCH] radeonsi: don't overwrite info.tess._primitive mode when it can be correct MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The linker now sets TCS info to match TES, and the key can contain 0 if it's not optimized. Reviewed-by: Timur Kristóf Part-of: --- src/gallium/drivers/radeonsi/si_shader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index a31d3291c58..d5453ff0830 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -1870,7 +1870,8 @@ static bool si_lower_io_to_mem(struct si_shader *shader, nir_shader *nir, key->ge.opt.same_patch_vertices, sel->info.tcs_vgpr_only_inputs); /* Used by hs_emit_write_tess_factors() when monolithic shader. */ - nir->info.tess._primitive_mode = key->ge.opt.tes_prim_mode; + if (nir->info.tess._primitive_mode == TESS_PRIMITIVE_UNSPECIFIED) + nir->info.tess._primitive_mode = key->ge.opt.tes_prim_mode; NIR_PASS_V(nir, ac_nir_lower_hs_outputs_to_mem, si_map_io_driver_location, sel->screen->info.gfx_level,