d3dcompiler: Check for multiple matrix majority keywords on typedefs.

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3dcompiler: Check for multiple matrix majority keywords on typedefs.
d05ee367 · Zebediah Figura · Alexandre Julliard · 5e753108 · d05ee367
Commit d05ee367 authored Apr 02, 2020 by Zebediah Figura Committed by Alexandre Julliard Apr 14, 2020
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

hlsl.y dlls/d3dcompiler_43/hlsl.y +4 -0

No files found.
--- a/dlls/d3dcompiler_43/hlsl.y
+++ b/dlls/d3dcompiler_43/hlsl.y
@@ -814,6 +814,10 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis
        if (type->type != HLSL_CLASS_MATRIX)
            check_invalid_matrix_modifiers(type->modifiers, v->loc);

+        if ((type->modifiers & HLSL_MODIFIER_COLUMN_MAJOR)
+                && (type->modifiers & HLSL_MODIFIER_ROW_MAJOR))
+            hlsl_report_message(v->loc, HLSL_LEVEL_ERROR, "more than one matrix majority keyword");
+
        ret = add_type_to_scope(hlsl_ctx.cur_scope, type);
        if (!ret)
        {