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

nir/lower_shader_calls: Fix cursor if broken after nir_cf_extract() call

Browse source 
Fixes: e2dadda3 ("Revert "nir/lower_shader_calls: put inserted instructions into a dummy block")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8978
Signed-off-by: Sviatoslav Peleshko <sviatoslav.peleshko@globallogic.com>
Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22884>
This commit is contained in:
Sviatoslav Peleshko 2023-05-05 10:00:48 +03:00 • committed by Marge Bot
parent ba0787f266
commit 08e95f8f8e
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/compiler/nir/nir_lower_shader_calls.c
View file

@ -1164,6 +1164,21 @@ found_resume:
nir_after_cf_list(child_list));
}
/* If the resume instruction is in the first block of the child_list,
* and the cursor is still before that block, the nir_cf_extract() may
* extract the block object pointed by the cursor, and instead create
* a new one for the code before the resume. In such case the cursor
* will be broken, as it will point to a block which is no longer
* in a function.
*
* Luckily, in both cases when this is possible, the intended cursor
* position is right before the child_list, so we can fix the cursor here.
*/
if (child_list_contains_cursor &&
b->cursor.option == nir_cursor_before_block &&
b->cursor.block->cf_node.parent == NULL)
b->cursor = nir_before_cf_list(child_list);
if (cursor_is_after_jump(b->cursor)) {
/* If the resume instruction is in a loop, it's possible cf_list ends
* in a break or continue instruction, in which case we don't want to