From 1b808f1dea18dc2fdeb1618ef927fb3ca3efa2c8 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 15 Sep 2021 13:18:18 +0200 Subject: [PATCH] etnaviv: fix emit_if in case the else block ends in a jump Fixes piglit test shaders@ssa@fs-if-def-else-break. Signed-off-by: Philipp Zabel Reviewed-by: Lucas Stach Reviewed-by: Christian Gmeiner Part-of: --- src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c index 00ebc250bdd..d4031c8cef3 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c @@ -653,7 +653,7 @@ emit_if(struct etna_compile *c, nir_if * nif) */ if (!nir_block_ends_in_jump(nir_if_last_then_block(nif)) && !nir_cf_list_is_empty_block(&nif->else_list)) - etna_emit_jump(c, nir_if_last_else_block(nif)->successors[0]->index, SRC_DISABLE); + etna_emit_jump(c, nir_if_last_then_block(nif)->successors[0]->index, SRC_DISABLE); emit_cf_list(c, &nif->else_list); }