[PATCH v6 7/8] vkd3d-shader/tpf: Validate input and output index ranges for default control point phases.

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/tpf.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c
index e90fb64d..c5d4bdff 100644
--- a/libs/vkd3d-shader/tpf.c
+++ b/libs/vkd3d-shader/tpf.c
@@ -565,6 +565,7 @@ struct vkd3d_shader_sm4_parser
     unsigned int output_map[MAX_REG_OUTPUT];

enum vkd3d_shader_opcode phase;
+    bool has_control_point_phase;
     unsigned int input_register_masks[MAX_REG_OUTPUT];
     unsigned int output_register_masks[MAX_REG_OUTPUT];
     unsigned int patch_constant_register_masks[MAX_REG_OUTPUT];
@@ -2156,6 +2157,7 @@ static void shader_sm4_read_instruction(struct vkd3d_shader_sm4_parser *sm4, str
     if (ins->handler_idx == VKD3DSIH_HS_CONTROL_POINT_PHASE || ins->handler_idx == VKD3DSIH_HS_FORK_PHASE
             || ins->handler_idx == VKD3DSIH_HS_JOIN_PHASE)
         sm4->phase = ins->handler_idx;
+    sm4->has_control_point_phase |= ins->handler_idx == VKD3DSIH_HS_CONTROL_POINT_PHASE;
     ins->flags = 0;
     ins->coissue = false;
     ins->raw = false;
@@ -2367,6 +2369,23 @@ static bool shader_sm4_parser_validate_signature(struct vkd3d_shader_sm4_parser
     return true;
 }

+static void shader_sm4_validate_default_phase_index_ranges(struct vkd3d_shader_sm4_parser *sm4)
+{
+    unsigned int i;
+
+    for (i = 0; i < ARRAY_SIZE(sm4->input_index_range_masks); ++i)
+    {
+        if (sm4->input_index_range_masks[i] != sm4->output_index_range_masks[i])
+        {
+            WARN("Default phase index range maps are not identical.\n");
+            vkd3d_shader_parser_error(&sm4->p, VKD3D_SHADER_ERROR_TPF_INVALID_INDEX_RANGE_DCL,
+                    "Default control point phase input and output register index ranges for index %u "
+                    "are not identical.", i);
+            return;
+        }
+    }
+}
+
 int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compile_info,
         struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser **parser)
 {
@@ -2432,6 +2451,8 @@ int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compi
         }
         ++instructions->count;
     }
+    if (sm4->p.shader_version.type == VKD3D_SHADER_TYPE_HULL && !sm4->has_control_point_phase && !sm4->p.failed)
+        shader_sm4_validate_default_phase_index_ranges(sm4);

*parser = &sm4->p;