From 3570edeae23a84e870f07587903fa27620ec367c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 14 Oct 2024 22:57:25 -0400 Subject: [PATCH] radeonsi: fix passing TCS wave ID from LS to HS for monolithic LS+HS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit required by the new HS shader message code Reviewed-by: Timur Kristóf Part-of: --- src/gallium/drivers/radeonsi/si_shader_llvm_tess.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm_tess.c b/src/gallium/drivers/radeonsi/si_shader_llvm_tess.c index 5f9409dccb2..007d7050ae6 100644 --- a/src/gallium/drivers/radeonsi/si_shader_llvm_tess.c +++ b/src/gallium/drivers/radeonsi/si_shader_llvm_tess.c @@ -58,7 +58,9 @@ void si_llvm_ls_build_end(struct si_shader_context *ctx) ret = si_insert_input_ret(ctx, ret, ctx->args->ac.tess_offchip_offset, 2); ret = si_insert_input_ret(ctx, ret, ctx->args->ac.merged_wave_info, 3); ret = si_insert_input_ret(ctx, ret, ctx->args->ac.tcs_factor_offset, 4); - if (ctx->screen->info.gfx_level <= GFX10_3) + if (ctx->screen->info.gfx_level >= GFX11) + ret = si_insert_input_ret(ctx, ret, ctx->args->ac.tcs_wave_id, 5); + else ret = si_insert_input_ret(ctx, ret, ctx->args->ac.scratch_offset, 5); ret = si_insert_input_ptr(ctx, ret, ctx->args->internal_bindings, 8 + SI_SGPR_INTERNAL_BINDINGS);