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 20:15:42 +02:00 committed by Henri Verbeet
parent 4b06729be8
commit 5c0d640d18
Notes: Henri Verbeet 2024-09-11 15:34:39 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1058
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6668,9 +6668,6 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t
vsir_transform(&ctx, vsir_program_structurize); vsir_transform(&ctx, vsir_program_structurize);
vsir_transform(&ctx, vsir_program_flatten_control_flow_constructs); vsir_transform(&ctx, vsir_program_flatten_control_flow_constructs);
vsir_transform(&ctx, vsir_program_materialize_undominated_ssas_to_temps); vsir_transform(&ctx, vsir_program_materialize_undominated_ssas_to_temps);
if (ctx.result < 0)
return ctx.result;
} }
else else
{ {
@ -6688,14 +6685,13 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t
vsir_transform(&ctx, vsir_program_remove_dead_code); vsir_transform(&ctx, vsir_program_remove_dead_code);
vsir_transform(&ctx, vsir_program_normalise_combined_samplers); vsir_transform(&ctx, vsir_program_normalise_combined_samplers);
if (compile_info->target_type != VKD3D_SHADER_TARGET_GLSL)
vsir_transform(&ctx, vsir_program_flatten_control_flow_constructs);
}
if (ctx.result < 0) if (ctx.result < 0)
return ctx.result; return ctx.result;
if (compile_info->target_type != VKD3D_SHADER_TARGET_GLSL
&& (result = vsir_program_flatten_control_flow_constructs(program, &ctx)) < 0)
return result;
}
if ((result = vsir_program_insert_alpha_test(program, message_context)) < 0) if ((result = vsir_program_insert_alpha_test(program, message_context)) < 0)
return result; return result;