diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c
index 8acd769a..8fdd086f 100644
--- a/libs/vkd3d-shader/ir.c
+++ b/libs/vkd3d-shader/ir.c
@@ -6203,6 +6203,13 @@ static void vsir_validate_ifc(struct validation_context *ctx, const struct vkd3d
     vsir_validator_push_block(ctx, VKD3DSIH_IF);
 }
 
+static void vsir_validate_loop(struct validation_context *ctx, const struct vkd3d_shader_instruction *instruction)
+{
+    vsir_validate_cf_type(ctx, instruction, VSIR_CF_STRUCTURED);
+    vsir_validate_src_count(ctx, instruction, ctx->program->shader_version.major <= 3 ? 2 : 0);
+    vsir_validator_push_block(ctx, VKD3DSIH_LOOP);
+}
+
 struct vsir_validator_instruction_desc
 {
     unsigned int dst_param_count;
@@ -6212,11 +6219,12 @@ struct vsir_validator_instruction_desc
 
 static const struct vsir_validator_instruction_desc vsir_validator_instructions[] =
 {
-    [VKD3DSIH_DCL_TEMPS] = {0, 0, vsir_validate_dcl_temps},
-    [VKD3DSIH_ELSE] =      {0, 0, vsir_validate_else},
-    [VKD3DSIH_ENDIF] =     {0, 0, vsir_validate_endif},
-    [VKD3DSIH_IF] =        {0, 1, vsir_validate_if},
-    [VKD3DSIH_IFC] =       {0, 2, vsir_validate_ifc},
+    [VKD3DSIH_DCL_TEMPS] = {0,   0, vsir_validate_dcl_temps},
+    [VKD3DSIH_ELSE] =      {0,   0, vsir_validate_else},
+    [VKD3DSIH_ENDIF] =     {0,   0, vsir_validate_endif},
+    [VKD3DSIH_IF] =        {0,   1, vsir_validate_if},
+    [VKD3DSIH_IFC] =       {0,   2, vsir_validate_ifc},
+    [VKD3DSIH_LOOP] =      {0, ~0u, vsir_validate_loop},
 };
 
 static void vsir_validate_instruction(struct validation_context *ctx)
@@ -6379,15 +6387,6 @@ static void vsir_validate_instruction(struct validation_context *ctx)
 
     switch (instruction->opcode)
     {
-        case VKD3DSIH_LOOP:
-            vsir_validate_cf_type(ctx, instruction, VSIR_CF_STRUCTURED);
-            vsir_validate_dst_count(ctx, instruction, 0);
-            vsir_validate_src_count(ctx, instruction, version->major <= 3 ? 2 : 0);
-            if (!vkd3d_array_reserve((void **)&ctx->blocks, &ctx->blocks_capacity, ctx->depth + 1, sizeof(*ctx->blocks)))
-                return;
-            ctx->blocks[ctx->depth++] = instruction->opcode;
-            break;
-
         case VKD3DSIH_ENDLOOP:
             vsir_validate_cf_type(ctx, instruction, VSIR_CF_STRUCTURED);
             vsir_validate_dst_count(ctx, instruction, 0);