[PATCH 6/7] ir: Validate the DCL_TEMPS instruction.

[Giovanni Mascellani]

From: Giovanni Mascellani

---
 libs/vkd3d-shader/ir.c                   | 27 ++++++++++++++++++++++++
 libs/vkd3d-shader/vkd3d_shader_private.h |  2 ++
 2 files changed, 29 insertions(+)

diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c
index 8907fe5fc..80eb06bdb 100644
--- a/libs/vkd3d-shader/ir.c
+++ b/libs/vkd3d-shader/ir.c
@@ -1563,6 +1563,22 @@ static void vsir_validate_src_param(struct validation_context *ctx,
                 src->modifiers);
 }

+static void vsir_validate_dst_count(struct validation_context *ctx,
+        const struct vkd3d_shader_instruction *instruction, unsigned int count)
+{
+    if (instruction->dst_count != 0)
+        validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DEST_COUNT,
+                "Invalid destination count %u for an instruction of type %#x.", instruction->dst_count, instruction->handler_idx);
+}
+
+static void vsir_validate_src_count(struct validation_context *ctx,
+        const struct vkd3d_shader_instruction *instruction, unsigned int count)
+{
+    if (instruction->src_count != 0)
+        validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SOURCE_COUNT,
+                "Invalid source count %u for an instruction of type %#x.", instruction->src_count, instruction->handler_idx);
+}
+
 static void vsir_validate_instruction(struct validation_context *ctx)
 {
     const struct vkd3d_shader_instruction *instruction = &ctx->parser->instructions.elements[ctx->instruction_idx];
@@ -1581,6 +1597,17 @@ static void vsir_validate_instruction(struct validation_context *ctx)
         validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER, "Invalid instruction handler %#x.",
                 instruction->handler_idx);
     }
+
+    switch (instruction->handler_idx)
+    {
+        case VKD3DSIH_DCL_TEMPS:
+            vsir_validate_dst_count(ctx, instruction, 0);
+            vsir_validate_src_count(ctx, instruction, 0);
+            break;
+
+        default:
+            break;
+    }
 }

void vsir_validate(struct vkd3d_shader_parser *parser)
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index f399f91a3..e57cb44c5 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -203,6 +203,8 @@ enum vkd3d_shader_error
     VKD3D_SHADER_ERROR_VSIR_INVALID_DIMENSION           = 9009,
     VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT         = 9010,
     VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX               = 9011,
+    VKD3D_SHADER_ERROR_VSIR_INVALID_DEST_COUNT          = 9012,
+    VKD3D_SHADER_ERROR_VSIR_INVALID_SOURCE_COUNT        = 9013,
 };

enum vkd3d_shader_opcode