From 455c826a6a60fbb6eb0ab9d6a53014c2bc0861b6 Mon Sep 17 00:00:00 2001 From: Giovanni Mascellani Date: Thu, 5 Sep 2024 10:09:30 +0200 Subject: [PATCH] vkd3d-shader/ir: Run validation after structurization. --- libs/vkd3d-shader/ir.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index a118a89b..d9d20cff 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -5283,8 +5283,9 @@ out: } 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}; enum vkd3d_result ret; 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_lower_switch_to_selection_ladder); + vsir_transform(&ctx, vsir_program_structurize); if (ctx.result < 0) 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) return result;