Zebediah Figura : vkd3d-shader/hlsl: Do not set an initial latent matrix majority.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 322963add80271e59e46ac61559d4408c153d4bc
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/322963add80271e59e46ac61559d44...

Author: Zebediah Figura 
Date:   Tue Mar 29 18:55:42 2022 -0500

vkd3d-shader/hlsl: Do not set an initial latent matrix majority.

This change does nothing by itself.

---

libs/vkd3d-shader/hlsl.c | 2 --
 libs/vkd3d-shader/hlsl.y | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index 3cf3e6d0..24822e97 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -2973,8 +2973,6 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const char *source_name,
     ctx->location.line = ctx->location.column = 1;
     vkd3d_string_buffer_cache_init(&ctx->string_buffers);

-    ctx->matrix_majority = HLSL_MODIFIER_COLUMN_MAJOR;
-
     list_init(&ctx->scopes);

if (!(ctx->dummy_scope = hlsl_new_scope(ctx, NULL)))
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index c072362c..6162423c 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -886,7 +886,8 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_
             && !(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK)
             && type->type == HLSL_CLASS_MATRIX)
     {
-        default_majority = ctx->matrix_majority;
+        if (!(default_majority = ctx->matrix_majority))
+            default_majority = HLSL_MODIFIER_COLUMN_MAJOR;
     }
     else if (type->type != HLSL_CLASS_MATRIX)
     {