From 69b119bc00a0d62179f98b04cf2f3a60ab8ef36d Mon Sep 17 00:00:00 2001 From: Vasily Khoruzhick Date: Tue, 25 Feb 2025 21:38:18 -0800 Subject: [PATCH] lima: ppir: assign actual index to discard block Discard block is always added to the block list after translation from NIR, so we can just assign it an index that equals to block list size. Reviewed-by: Erico Nunes Signed-off-by: Vasily Khoruzhick Part-of: --- src/gallium/drivers/lima/ir/pp/nir.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/lima/ir/pp/nir.c b/src/gallium/drivers/lima/ir/pp/nir.c index beb9c9a591e..edebab28167 100644 --- a/src/gallium/drivers/lima/ir/pp/nir.c +++ b/src/gallium/drivers/lima/ir/pp/nir.c @@ -293,7 +293,6 @@ static bool ppir_emit_discard_block(ppir_compiler *comp) comp->discard_block = block; block->comp = comp; - block->index = INT_MAX; discard = ppir_node_create(block, ppir_op_discard, -1, 0); if (discard) @@ -1062,8 +1061,10 @@ bool ppir_compile_nir(struct lima_fs_compiled_shader *prog, struct nir_shader *n goto err_out0; /* If we have discard block add it to the very end */ - if (comp->discard_block) + if (comp->discard_block) { + comp->discard_block->index = list_length(&comp->block_list); list_addtail(&comp->discard_block->list, &comp->block_list); + } ppir_node_print_prog(comp);