diff options
Diffstat (limited to 'source/slang/slang-check-constraint.cpp')
| -rw-r--r-- | source/slang/slang-check-constraint.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/source/slang/slang-check-constraint.cpp b/source/slang/slang-check-constraint.cpp index b9d33a1c1..d66bf35cc 100644 --- a/source/slang/slang-check-constraint.cpp +++ b/source/slang/slang-check-constraint.cpp @@ -186,20 +186,15 @@ namespace Slang { if (auto rightBasic = as<BasicExpressionType>(right)) { - auto leftFlavor = leftBasic->getBaseType(); - auto rightFlavor = rightBasic->getBaseType(); + auto costConvertRightToLeft = getConversionCost(leftBasic, rightBasic); + auto costConvertLeftToRight = getConversionCost(rightBasic, leftBasic); - // TODO(tfoley): Need a special-case rule here that if - // either operand is of type `half`, then we promote - // to at least `float` - - // Return the one that had higher rank... - if (leftFlavor > rightFlavor) - return left; + // Return the one that had lower conversion cost. + if (costConvertRightToLeft > costConvertLeftToRight) + return right; else { - SLANG_ASSERT(rightFlavor > leftFlavor); // equality was handles at the top of this function - return right; + return left; } } |