Module: Mesa Branch: main Commit: b70c235e4afde19099d7aaf0d039e40d8f43e318 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b70c235e4afde19099d7aaf0d039e40d8f43e318
Author: Rhys Perry <pendingchao...@gmail.com> Date: Tue Nov 7 17:45:59 2023 +0000 aco: skip LS VGPR initialization bug workaround if the prolog exists Otherwise, we would do this twice. Signed-off-by: Rhys Perry <pendingchao...@gmail.com> Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26111> --- src/amd/compiler/aco_instruction_selection.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index d77f166c391..e0d2097deee 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -11847,7 +11847,8 @@ select_shader(isel_context& ctx, nir_shader* nir, const bool need_startpgm, cons Pseudo_instruction* startpgm = add_startpgm(&ctx); append_logical_start(ctx.block); - if (unlikely(ctx.options->has_ls_vgpr_init_bug && ctx.stage == vertex_tess_control_hs)) + if (ctx.options->has_ls_vgpr_init_bug && ctx.stage == vertex_tess_control_hs && + !program->info.vs.has_prolog) fix_ls_vgpr_init_bug(&ctx); split_arguments(&ctx, startpgm);
