Module: Mesa Branch: main Commit: 1b808f1dea18dc2fdeb1618ef927fb3ca3efa2c8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b808f1dea18dc2fdeb1618ef927fb3ca3efa2c8
Author: Philipp Zabel <[email protected]> Date: Wed Sep 15 13:18:18 2021 +0200 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 <[email protected]> Reviewed-by: Lucas Stach <[email protected]> Reviewed-by: Christian Gmeiner <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12892> --- 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); }
