NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

aco: add create_end_for_merged_shader

Browse source 
For radeonsi merged shader LS/ES part to pass args to next
stage.

Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25631>
This commit is contained in:
Qiang Yu 2023-08-29 14:21:08 +08:00 • committed by Marge Bot
parent 71fd3c2a35
commit e2af0b0b3f
1 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/amd/compiler/aco_instruction_selection.cpp
View file

@ -11747,6 +11747,30 @@ create_merged_jump_to_epilog(isel_context* ctx)
ctx->block->instructions.emplace_back(std::move(jump));
}
static void
create_end_for_merged_shader(isel_context* ctx)
{
std::vector<Operand> regs;
unsigned max_args;
if (ctx->stage.sw == SWStage::VS) {
assert(ctx->args->vertex_id.used);
max_args = ctx->args->vertex_id.arg_index;
} else {
assert(ctx->stage.sw == SWStage::TES);
assert(ctx->args->tes_u.used);
max_args = ctx->args->tes_u.arg_index;
}
struct ac_arg arg;
arg.used = true;
for (arg.arg_index = 0; arg.arg_index < max_args; arg.arg_index++)
regs.emplace_back(get_arg_for_end(ctx, arg));
build_end_with_regs(ctx, regs);
}
void
select_shader(isel_context& ctx, nir_shader* nir, const bool need_startpgm, const bool need_barrier,
if_context* ic_merged_wave_info, const bool check_merged_wave_info,
@ -11828,7 +11852,10 @@ select_shader(isel_context& ctx, nir_shader* nir, const bool need_startpgm, cons
if (ctx.program->info.merged_shader_compiled_separately &&
(ctx.stage.sw == SWStage::VS || ctx.stage.sw == SWStage::TES)) {
assert(program->gfx_level >= GFX9);
create_merged_jump_to_epilog(&ctx);
if (ctx.options->is_opengl)
create_end_for_merged_shader(&ctx);
else
create_merged_jump_to_epilog(&ctx);
}
cleanup_context(&ctx);