wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Open a loop when visiting the loop header.

Browse Source 
Not when making the loop header available, which is too early and
might lead to open too many loops at once.
This commit is contained in:
Giovanni Mascellani 2024-03-20 16:58:25 +01:00 committed by Alexandre Julliard
parent e1e6367210
commit 9aff65c6d2
Notes: Alexandre Julliard 2024-04-03 23:34:52 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Conor McCarthy (@cmccarthy)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/737
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libs/vkd3d-shader/ir.c
View File

@ -3629,27 +3629,11 @@ struct vsir_cfg_node_sorter
static enum vkd3d_result vsir_cfg_node_sorter_make_node_available(struct vsir_cfg_node_sorter *sorter, struct vsir_block *block) static enum vkd3d_result vsir_cfg_node_sorter_make_node_available(struct vsir_cfg_node_sorter *sorter, struct vsir_block *block)
{ {
struct vsir_block_list *loop = NULL;
struct vsir_cfg_node_sorter_stack_item *item;
enum vkd3d_result ret; enum vkd3d_result ret;
if (sorter->cfg->loops_by_header[block->label - 1] != SIZE_MAX)
loop = &sorter->cfg->loops[sorter->cfg->loops_by_header[block->label - 1]];
if ((ret = vsir_block_list_add_checked(&sorter->available_blocks, block)) < 0) if ((ret = vsir_block_list_add_checked(&sorter->available_blocks, block)) < 0)
return ret; return ret;
if (!loop)
return VKD3D_OK;
if (!vkd3d_array_reserve((void **)&sorter->stack, &sorter->stack_capacity, sorter->stack_count + 1, sizeof(*sorter->stack)))
return VKD3D_ERROR_OUT_OF_MEMORY;
item = &sorter->stack[sorter->stack_count++];
item->loop = loop;
item->seen_count = 0;
item->begin = sorter->cfg->order.count;
return VKD3D_OK; return VKD3D_OK;
} }
@ -3754,6 +3738,24 @@ static enum vkd3d_result vsir_cfg_sort_nodes(struct vsir_cfg *cfg)
break; break;
} }
/* If the node is a loop header, open the loop. */
if (sorter.cfg->loops_by_header[block->label - 1] != SIZE_MAX)
{
struct vsir_block_list *loop = &sorter.cfg->loops[sorter.cfg->loops_by_header[block->label - 1]];
if (loop)
{
if (!vkd3d_array_reserve((void **)&sorter.stack, &sorter.stack_capacity,
sorter.stack_count + 1, sizeof(*sorter.stack)))
return VKD3D_ERROR_OUT_OF_MEMORY;
inner_stack_item = &sorter.stack[sorter.stack_count++];
inner_stack_item->loop = loop;
inner_stack_item->seen_count = 0;
inner_stack_item->begin = sorter.cfg->order.count;
}
}
vsir_block_list_remove_index(&sorter.available_blocks, i); vsir_block_list_remove_index(&sorter.available_blocks, i);
block->order_pos = cfg->order.count; block->order_pos = cfg->order.count;
if ((ret = vsir_block_list_add_checked(&cfg->order, block)) < 0) if ((ret = vsir_block_list_add_checked(&cfg->order, block)) < 0)