fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 11:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aco: append p_logical_end after monolithic RT shaders

Browse source 
Fixes: bdec044c88 ('aco: Do not fixup registers if there are no shader calls')
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25038>
This commit is contained in:
Daniel Schürmann 2023-09-13 16:40:55 +02:00 • committed by Marge Bot
parent c5fb2fff18
commit 0e8192a76b
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11344,9 +11344,6 @@ merged_wave_info_to_mask(isel_context* ctx, unsigned i)
static void
insert_rt_jump_next(isel_context& ctx, const struct ac_shader_args* args)
{
append_logical_end(ctx.block);
ctx.block->kind |= block_kind_uniform;
unsigned src_count = ctx.args->arg_count;
Pseudo_instruction* ret =
create_instruction<Pseudo_instruction>(aco_opcode::p_return, Format::PSEUDO, src_count, 0);
@ -11384,6 +11381,8 @@ select_program_rt(isel_context& ctx, unsigned shader_count, struct nir_shader* c
append_logical_start(ctx.block);
split_arguments(&ctx, startpgm);
visit_cf_list(&ctx, &nir_shader_get_entrypoint(nir)->body);
append_logical_end(ctx.block);
ctx.block->kind |= block_kind_uniform;
/* Fix output registers and jump to next shader. We can skip this when dealing with a raygen
* shader without shader calls.