wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-09-13 09:16:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Run validation after flattening control flow constructs.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-09-05 10:11:52 +02:00 committed by Henri Verbeet
parent 455c826a6a
commit 08c1f4d45e
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 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2799,8 +2799,9 @@ static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flatte
} }
static enum vkd3d_result vsir_program_flatten_control_flow_constructs(struct vsir_program *program, static enum vkd3d_result vsir_program_flatten_control_flow_constructs(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 cf_flattener flattener = {.program = program}; struct cf_flattener flattener = {.program = program};
enum vkd3d_result result; enum vkd3d_result result;
@ -6666,13 +6667,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); vsir_transform(&ctx, vsir_program_structurize);
vsir_transform(&ctx, vsir_program_flatten_control_flow_constructs);
if (ctx.result < 0) if (ctx.result < 0)
return ctx.result; return ctx.result;
if ((result = vsir_program_flatten_control_flow_constructs(program, message_context)) < 0)
return result;
if ((result = vsir_program_materialize_undominated_ssas_to_temps(program, message_context)) < 0) if ((result = vsir_program_materialize_undominated_ssas_to_temps(program, message_context)) < 0)
return result; return result;
} }
@ -6709,7 +6708,7 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t
return result; return result;
if (compile_info->target_type != VKD3D_SHADER_TARGET_GLSL if (compile_info->target_type != VKD3D_SHADER_TARGET_GLSL
&& (result = vsir_program_flatten_control_flow_constructs(program, message_context)) < 0) && (result = vsir_program_flatten_control_flow_constructs(program, &ctx)) < 0)
return result; return result;
} }