Zebediah Figura : vkd3d-shader/hlsl: Remove a redundant warning for mutually exclusive majority modifiers.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 72ec5563f87dbcb59bc2db18c7708b88bf9597e6
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/72ec5563f87dbcb59bc2db18c7708b...

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Tue Mar 29 17:03:59 2022 -0500

vkd3d-shader/hlsl: Remove a redundant warning for mutually exclusive majority modifiers.

We will warn subsequently in apply_type_modifiers() or add_typedef().

---

 libs/vkd3d-shader/hlsl.y | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index da78d291..e158f1de 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -408,12 +408,6 @@ static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, con
         hlsl_release_string_buffer(ctx, string);
         return modifiers;
     }
-    if ((mod & HLSL_MODIFIERS_MAJORITY_MASK) && (modifiers & HLSL_MODIFIERS_MAJORITY_MASK))
-    {
-        hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER,
-                "'row_major' and 'column_major' modifiers are mutually exclusive.");
-        return modifiers;
-    }
     return modifiers | mod;
 }