wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This change does nothing by itself.
This commit is contained in:
Zebediah Figura 2022-03-29 18:55:42 -05:00 committed by Alexandre Julliard
parent 75ab9d31ef
commit 322963add8
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
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/vkd3d-shader/hlsl.c
View File

@ -2973,8 +2973,6 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const char *source_name,
ctx->location.line = ctx->location.column = 1; ctx->location.line = ctx->location.column = 1;
vkd3d_string_buffer_cache_init(&ctx->string_buffers); vkd3d_string_buffer_cache_init(&ctx->string_buffers);
ctx->matrix_majority = HLSL_MODIFIER_COLUMN_MAJOR;
list_init(&ctx->scopes); list_init(&ctx->scopes);
if (!(ctx->dummy_scope = hlsl_new_scope(ctx, NULL))) if (!(ctx->dummy_scope = hlsl_new_scope(ctx, NULL)))

3
libs/vkd3d-shader/hlsl.y
View File

@ -886,7 +886,8 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_
&& !(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK) && !(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK)
&& type->type == HLSL_CLASS_MATRIX) && 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) else if (type->type != HLSL_CLASS_MATRIX)
{ {