wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Move the base type equality case in expr_common_base_type.

Browse Source 
Signed-off-by: Giovanni Mascellani <gmascellani@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Giovanni Mascellani 2021-08-27 12:05:11 +02:00 committed by Alexandre Julliard
parent 54bef05070
commit 5a55e8e8d5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -916,6 +916,9 @@ static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hl
}; };
int t1_idx = -1, t2_idx = -1, i; int t1_idx = -1, t2_idx = -1, i;
if (t1 == t2)
return t1;
for (i = 0; i < ARRAY_SIZE(types); ++i) for (i = 0; i < ARRAY_SIZE(types); ++i)
{ {
/* Always convert away from HLSL_TYPE_HALF */ /* Always convert away from HLSL_TYPE_HALF */
@ -981,10 +984,7 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type
return NULL; return NULL;
} }
if (t1->base_type == t2->base_type) base = expr_common_base_type(t1->base_type, t2->base_type);
base = t1->base_type;
else
base = expr_common_base_type(t1->base_type, t2->base_type);
if (t1->dimx == 1 && t1->dimy == 1) if (t1->dimx == 1 && t1->dimy == 1)
{ {