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: Run validation after structurization.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-09-05 10:09:30 +02:00 committed by Henri Verbeet
parent e935dcb88d
commit 455c826a6a
Notes: Henri Verbeet 2024-09-05 16:38:53 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1043
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5283,8 +5283,9 @@ out:
} }
static enum vkd3d_result vsir_program_structurize(struct vsir_program *program, static enum vkd3d_result vsir_program_structurize(struct vsir_program *program,
struct vkd3d_shader_message_context *message_context) struct vsir_normalisation_context *ctx)
{ {
struct vkd3d_shader_message_context *message_context = ctx->message_context;
struct vsir_cfg_emit_target target = {0}; struct vsir_cfg_emit_target target = {0};
enum vkd3d_result ret; enum vkd3d_result ret;
size_t i; size_t i;
@ -6664,13 +6665,11 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t
{ {
vsir_transform(&ctx, vsir_program_materialise_phi_ssas_to_temps); vsir_transform(&ctx, vsir_program_materialise_phi_ssas_to_temps);
vsir_transform(&ctx, vsir_program_lower_switch_to_selection_ladder); vsir_transform(&ctx, vsir_program_lower_switch_to_selection_ladder);
vsir_transform(&ctx, vsir_program_structurize);
if (ctx.result < 0) if (ctx.result < 0)
return ctx.result; return ctx.result;
if ((result = vsir_program_structurize(program, message_context)) < 0)
return result;
if ((result = vsir_program_flatten_control_flow_constructs(program, message_context)) < 0) if ((result = vsir_program_flatten_control_flow_constructs(program, message_context)) < 0)
return result; return result;