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: Return int as common type between bool and bool.

Browse Source 
So does the native d3dcompiler, following the spirit of integer promotion
in C.

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

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

@ -917,7 +917,7 @@ 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) if (t1 == t2)
return t1; return t1 == HLSL_TYPE_BOOL ? HLSL_TYPE_INT : t1;
for (i = 0; i < ARRAY_SIZE(types); ++i) for (i = 0; i < ARRAY_SIZE(types); ++i)
{ {