vkd3d-shader/hlsl: Store the matrix majority as a type modifiers bitmask.

This commit is contained in:
Zebediah Figura
2022-03-29 18:49:10 -05:00
committed by Alexandre Julliard
parent b3c620954b
commit 75ab9d31ef
Notes: Alexandre Julliard 2023-02-28 22:10:58 +01:00
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/102
4 changed files with 5 additions and 14 deletions

View File

@@ -886,10 +886,7 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_
&& !(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK)
&& type->type == HLSL_CLASS_MATRIX)
{
if (ctx->matrix_majority == HLSL_COLUMN_MAJOR)
default_majority = HLSL_MODIFIER_COLUMN_MAJOR;
else
default_majority = HLSL_MODIFIER_ROW_MAJOR;
default_majority = ctx->matrix_majority;
}
else if (type->type != HLSL_CLASS_MATRIX)
{