From 3f874138117b207d9996c241e9408fd46f514b48 Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Fri, 4 Aug 2023 20:14:30 +0800 Subject: [PATCH] aco: prepare fix_ls_vgpr_init_bug to be used by gl vs prolog Prolog does not have nir shader. Reviewed-by: Rhys Perry Signed-off-by: Qiang Yu Part-of: --- src/amd/compiler/aco_instruction_selection.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index eef9f28df67..8bfc14c71cf 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -11127,9 +11127,8 @@ add_startpgm(struct isel_context* ctx) } void -fix_ls_vgpr_init_bug(isel_context* ctx, Pseudo_instruction* startpgm) +fix_ls_vgpr_init_bug(isel_context* ctx) { - assert(ctx->shader->info.stage == MESA_SHADER_VERTEX); Builder bld(ctx->program, ctx->block); constexpr unsigned hs_idx = 1u; Builder::Result hs_thread_count = @@ -11491,7 +11490,7 @@ select_shader(isel_context& ctx, nir_shader* nir, const bool need_startpgm, cons append_logical_start(ctx.block); if (unlikely(ctx.options->has_ls_vgpr_init_bug && ctx.stage == vertex_tess_control_hs)) - fix_ls_vgpr_init_bug(&ctx, startpgm); + fix_ls_vgpr_init_bug(&ctx); split_arguments(&ctx, startpgm);