[PATCH v2 3/5] d3dcompiler: Don't add the default matrix majority attribute to variables.

[Matteo Bruni]

From: Zebediah Figura

This is a type modifier, and thus does not make a lot of sense on a variable.

Signed-off-by: Zebediah Figura 
Signed-off-by: Matteo Bruni 
---
It certainly seems better this way.

dlls/d3dcompiler_43/hlsl.y | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y
index a24d29e5df8..498ca4bb59d 100644
--- a/dlls/d3dcompiler_43/hlsl.y
+++ b/dlls/d3dcompiler_43/hlsl.y
@@ -129,15 +129,7 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local)
     BOOL ret;

TRACE("Declaring variable %s.\n", decl->name);
-    if (decl->data_type->type == HLSL_CLASS_MATRIX)
-    {
-        if (!(decl->modifiers & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR)))
-        {
-            decl->modifiers |= hlsl_ctx.matrix_majority == HLSL_ROW_MAJOR
-                    ? HLSL_MODIFIER_ROW_MAJOR : HLSL_MODIFIER_COLUMN_MAJOR;
-        }
-    }
-    else
+    if (decl->data_type->type != HLSL_CLASS_MATRIX)
         check_invalid_matrix_modifiers(decl->modifiers, decl->loc);

if (local)