[PATCH vkd3d 2/3] vkd3d-shader/hlsl: Return int as common type between bool and bool.
Giovanni Mascellani
gmascellani at codeweavers.com
Fri Aug 27 05:05:12 CDT 2021
So does the native d3dcompiler, following the spirit of integer promotion
in C.
Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
---
libs/vkd3d-shader/hlsl.y | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 4c3c0676..69c42b69 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -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;
if (t1 == t2)
- return t1;
+ return t1 == HLSL_TYPE_BOOL ? HLSL_TYPE_INT : t1;
for (i = 0; i < ARRAY_SIZE(types); ++i)
{
--
2.33.0
More information about the wine-devel
mailing list