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: Split program structurization.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-04-10 15:21:52 +02:00 committed by Alexandre Julliard
parent eb15f97083
commit d891ac5017
Notes: Alexandre Julliard 2024-04-15 22:22:40 +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/778
1 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4677,6 +4677,40 @@ fail:
return ret;
}
static enum vkd3d_result vsir_program_structurize(struct vsir_program *program,
struct vkd3d_shader_message_context *message_context)
{
enum vkd3d_result ret;
struct vsir_cfg cfg;
if ((ret = vsir_cfg_init(&cfg, program, message_context)) < 0)
return ret;
vsir_cfg_compute_dominators(&cfg);
if ((ret = vsir_cfg_compute_loops(&cfg)) < 0)
goto out;
if ((ret = vsir_cfg_sort_nodes(&cfg)) < 0)
goto out;
if ((ret = vsir_cfg_generate_synthetic_loop_intervals(&cfg)) < 0)
goto out;
if ((ret = vsir_cfg_build_structured_program(&cfg)) < 0)
goto out;
if ((ret = vsir_cfg_optimize(&cfg)) < 0)
goto out;
ret = vsir_cfg_emit_structured_program(&cfg);
out:
vsir_cfg_cleanup(&cfg);
return ret;
}
static void register_map_undominated_use(struct vkd3d_shader_register *reg, struct ssas_to_temps_alloc *alloc,
struct vsir_block *block, struct vsir_block **origin_blocks)
{
@ -5654,49 +5688,9 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t
if ((result = lower_switch_to_if_ladder(program)) < 0)
return result;
if ((result = vsir_cfg_init(&cfg, program, message_context)) < 0)
if ((result = vsir_program_structurize(program, message_context)) < 0)
return result;
vsir_cfg_compute_dominators(&cfg);
if ((result = vsir_cfg_compute_loops(&cfg)) < 0)
{
vsir_cfg_cleanup(&cfg);
return result;
}
if ((result = vsir_cfg_sort_nodes(&cfg)) < 0)
{
vsir_cfg_cleanup(&cfg);
return result;
}
if ((result = vsir_cfg_generate_synthetic_loop_intervals(&cfg)) < 0)
{
vsir_cfg_cleanup(&cfg);
return result;
}
if ((result = vsir_cfg_build_structured_program(&cfg)) < 0)
{
vsir_cfg_cleanup(&cfg);
return result;
}
if ((result = vsir_cfg_optimize(&cfg)) < 0)
{
vsir_cfg_cleanup(&cfg);
return result;
}
if ((result = vsir_cfg_emit_structured_program(&cfg)) < 0)
{
vsir_cfg_cleanup(&cfg);
return result;
}
vsir_cfg_cleanup(&cfg);
if ((result = vsir_program_flatten_control_flow_constructs(program, message_context)) < 0)
return result;