diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c
index 8fdd086f..075d23fd 100644
--- a/libs/vkd3d-shader/ir.c
+++ b/libs/vkd3d-shader/ir.c
@@ -6191,6 +6191,16 @@ static void vsir_validate_endif(struct validation_context *ctx, const struct vkd
         --ctx->depth;
 }
 
+static void vsir_validate_endloop(struct validation_context *ctx, const struct vkd3d_shader_instruction *instruction)
+{
+    vsir_validate_cf_type(ctx, instruction, VSIR_CF_STRUCTURED);
+    if (ctx->depth == 0 || ctx->blocks[ctx->depth - 1] != VKD3DSIH_LOOP)
+        validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW,
+                "ENDLOOP instruction doesn't terminate LOOP block.");
+    else
+        --ctx->depth;
+}
+
 static void vsir_validate_if(struct validation_context *ctx, const struct vkd3d_shader_instruction *instruction)
 {
     vsir_validate_cf_type(ctx, instruction, VSIR_CF_STRUCTURED);
@@ -6222,6 +6232,7 @@ 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_ENDLOOP] =   {0,   0, vsir_validate_endloop},
     [VKD3DSIH_IF] =        {0,   1, vsir_validate_if},
     [VKD3DSIH_IFC] =       {0,   2, vsir_validate_ifc},
     [VKD3DSIH_LOOP] =      {0, ~0u, vsir_validate_loop},
@@ -6387,16 +6398,6 @@ static void vsir_validate_instruction(struct validation_context *ctx)
 
     switch (instruction->opcode)
     {
-        case VKD3DSIH_ENDLOOP:
-            vsir_validate_cf_type(ctx, instruction, VSIR_CF_STRUCTURED);
-            vsir_validate_dst_count(ctx, instruction, 0);
-            vsir_validate_src_count(ctx, instruction, 0);
-            if (ctx->depth == 0 || ctx->blocks[ctx->depth - 1] != VKD3DSIH_LOOP)
-                validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW, "ENDLOOP instruction doesn't terminate LOOP block.");
-            else
-                --ctx->depth;
-            break;
-
         case VKD3DSIH_REP:
             vsir_validate_cf_type(ctx, instruction, VSIR_CF_STRUCTURED);
             vsir_validate_dst_count(ctx, instruction, 0);