From 8af2d04dbcc4df9e3770da002ca70df2bf1ab92b Mon Sep 17 00:00:00 2001 From: Giovanni Mascellani Date: Wed, 11 Sep 2024 13:13:39 +0200 Subject: [PATCH] vkd3d-shader/ir: Introduce a helper for validating IFC. --- libs/vkd3d-shader/ir.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 8a0b6625..2d7025dc 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -6176,6 +6176,12 @@ static void vsir_validate_if(struct validation_context *ctx, const struct vkd3d_ vsir_validator_push_block(ctx, VKD3DSIH_IF); } +static void vsir_validate_ifc(struct validation_context *ctx, const struct vkd3d_shader_instruction *instruction) +{ + vsir_validate_cf_type(ctx, instruction, VSIR_CF_STRUCTURED); + vsir_validator_push_block(ctx, VKD3DSIH_IF); +} + struct vsir_validator_instruction_desc { unsigned int dst_param_count; @@ -6187,6 +6193,7 @@ static const struct vsir_validator_instruction_desc vsir_validator_instructions[ { [VKD3DSIH_DCL_TEMPS] = {0, 0, vsir_validate_dcl_temps}, [VKD3DSIH_IF] = {0, 1, vsir_validate_if}, + [VKD3DSIH_IFC] = {0, 2, vsir_validate_ifc}, }; static void vsir_validate_instruction(struct validation_context *ctx) @@ -6349,15 +6356,6 @@ static void vsir_validate_instruction(struct validation_context *ctx) switch (instruction->opcode) { - case VKD3DSIH_IFC: - vsir_validate_cf_type(ctx, instruction, VSIR_CF_STRUCTURED); - vsir_validate_dst_count(ctx, instruction, 0); - vsir_validate_src_count(ctx, instruction, 2); - if (!vkd3d_array_reserve((void **)&ctx->blocks, &ctx->blocks_capacity, ctx->depth + 1, sizeof(*ctx->blocks))) - return; - ctx->blocks[ctx->depth++] = VKD3DSIH_IF; - break; - case VKD3DSIH_ELSE: vsir_validate_cf_type(ctx, instruction, VSIR_CF_STRUCTURED); vsir_validate_dst_count(ctx, instruction, 0);