[PATCH v2 1/5] vkd3d-shader: Introduce a boilerplate to validate the generated IR.

[Giovanni Mascellani]

From: Giovanni Mascellani

For the moment the validator is trivial, it never fails. Checks will
be added incrementally.
---
 libs/vkd3d-shader/ir.c                   | 24 ++++++++++++++++++++++++
 libs/vkd3d-shader/vkd3d_shader_main.c    | 12 ++++++++++++
 libs/vkd3d-shader/vkd3d_shader_private.h |  2 ++
 3 files changed, 38 insertions(+)

diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c
index 705905f7..bc205c5d 100644
--- a/libs/vkd3d-shader/ir.c
+++ b/libs/vkd3d-shader/ir.c
@@ -1292,3 +1292,27 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser,

return result;
 }
+
+struct validation_context
+{
+    struct vkd3d_shader_parser *parser;
+    struct vkd3d_string_buffer messages;
+};
+
+void vkd3d_shader_validate_vsir(struct vkd3d_shader_parser *parser)
+{
+    struct validation_context ctx = { .parser = parser };
+
+    if (!TRACE_ON())
+        return;
+
+    vkd3d_string_buffer_init(&ctx.messages);
+
+    if (ctx.messages.content_size)
+    {
+        ERR("Malformed instruction stream\n");
+        vkd3d_string_buffer_trace(&ctx.messages);
+    }
+
+    vkd3d_string_buffer_cleanup(&ctx.messages);
+}
diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index 38f90966..cfc2e784 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -1218,6 +1218,8 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info,
         return ret;
     }

+    vkd3d_shader_validate_vsir(parser);
+
     ret = scan_with_parser(compile_info, message_context, NULL, parser);
     vkd3d_shader_parser_destroy(parser);

@@ -1236,6 +1238,8 @@ static int scan_d3dbc(const struct vkd3d_shader_compile_info *compile_info,
         return ret;
     }

+    vkd3d_shader_validate_vsir(parser);
+
     ret = scan_with_parser(compile_info, message_context, NULL, parser);
     vkd3d_shader_parser_destroy(parser);

@@ -1254,6 +1258,8 @@ static int scan_dxil(const struct vkd3d_shader_compile_info *compile_info,
         return ret;
     }

+    vkd3d_shader_validate_vsir(parser);
+
     ret = scan_with_parser(compile_info, message_context, NULL, parser);
     vkd3d_shader_parser_destroy(parser);

@@ -1370,6 +1376,8 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info
         return ret;
     }

+    vkd3d_shader_validate_vsir(parser);
+
     ret = vkd3d_shader_parser_compile(parser, compile_info, out, message_context);

vkd3d_shader_parser_destroy(parser);
@@ -1403,6 +1411,8 @@ static int compile_d3d_bytecode(const struct vkd3d_shader_compile_info *compile_
         return ret;
     }

+    vkd3d_shader_validate_vsir(parser);
+
     vkd3d_shader_dump_shader(compile_info->source_type, parser->shader_version.type, &compile_info->source);

if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM)
@@ -1427,6 +1437,8 @@ static int compile_dxbc_dxil(const struct vkd3d_shader_compile_info *compile_inf
         return ret;
     }

+    vkd3d_shader_validate_vsir(parser);
+
     ret = vkd3d_shader_parser_compile(parser, compile_info, out, message_context);

vkd3d_shader_parser_destroy(parser);
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 84614a4e..0bcc95a8 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -1281,6 +1281,8 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info,
 int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d_shader_compile_info *compile_info,
         struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context);

+void vkd3d_shader_validate_vsir(struct vkd3d_shader_parser *parser);
+
 static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_type(
         enum vkd3d_data_type data_type)
 {