From e54ef18c9ae3f1289db4f3a4756ad42fd8f75a3e Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Fri, 19 May 2023 10:18:02 +0800 Subject: [PATCH] radeonsi: fix uses_instanceid for merged mono shader stage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit prev_shader.info.uses_instanceid is set by si_nir_lower_vs_inputs() when attribute divisor is used. Fixes: 894d92995cd ("radeonsi: monolithic VS emit prolog in nir directly") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9042 Reviewed-by: Marek Olšák Signed-off-by: Qiang Yu Part-of: --- .pick_status.json | 2 +- src/gallium/drivers/radeonsi/si_shader_llvm.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index dbd6960f61b..cb23023aff1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2902,7 +2902,7 @@ "description": "radeonsi: fix uses_instanceid for merged mono shader stage", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "894d92995cdcecfabf061cbacf65c194ea84338b" }, diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm.c b/src/gallium/drivers/radeonsi/si_shader_llvm.c index 68b3fd09edb..a196b27421e 100644 --- a/src/gallium/drivers/radeonsi/si_shader_llvm.c +++ b/src/gallium/drivers/radeonsi/si_shader_llvm.c @@ -1139,7 +1139,8 @@ bool si_llvm_compile_shader(struct si_screen *sscreen, struct ac_llvm_compiler * si_llvm_dispose(&ctx); return false; } - shader->info.uses_instanceid |= ls->info.uses_instanceid; + shader->info.uses_instanceid |= + ls->info.uses_instanceid || shader_ls.info.uses_instanceid; parts[0] = ctx.main_fn; for (int i = 0; i < ctx.args->ac.arg_count; i++) @@ -1184,7 +1185,8 @@ bool si_llvm_compile_shader(struct si_screen *sscreen, struct ac_llvm_compiler * si_llvm_dispose(&ctx); return false; } - shader->info.uses_instanceid |= es->info.uses_instanceid; + shader->info.uses_instanceid |= + es->info.uses_instanceid || shader_es.info.uses_instanceid; es_main = ctx.main_fn; /* Preserve main (= es_main) arguments. */