From 75afa659e9a16589638083a1fcf9e879225619cd Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 28 Mar 2024 16:57:53 -0700 Subject: Fix type union logic in generic type inference. (#3852) --- source/slang/slang-stdlib.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source/slang/slang-stdlib.cpp') diff --git a/source/slang/slang-stdlib.cpp b/source/slang/slang-stdlib.cpp index 2bc24d8ec..3c8b48e00 100644 --- a/source/slang/slang-stdlib.cpp +++ b/source/slang/slang-stdlib.cpp @@ -222,7 +222,12 @@ namespace Slang { return kConversionCost_IntegerToFloatConversion; } - + else if (toInfo.conversionKind == kBaseTypeConversionKind_Float + && toInfo.conversionRank >= kBaseTypeConversionRank_Int16 + && fromInfo.conversionRank >= kBaseTypeConversionRank_Int8) + { + return kConversionCost_IntegerToHalfConversion; + } // All other cases are considered as "general" conversions, // where we don't consider any one conversion better than // any others. -- cgit v1.2.3