summaryrefslogtreecommitdiff
path: root/source/slang/core.meta.slang
diff options
context:
space:
mode:
Diffstat (limited to 'source/slang/core.meta.slang')
-rw-r--r--source/slang/core.meta.slang10
1 files changed, 9 insertions, 1 deletions
diff --git a/source/slang/core.meta.slang b/source/slang/core.meta.slang
index 85d530254..6e4c06d7c 100644
--- a/source/slang/core.meta.slang
+++ b/source/slang/core.meta.slang
@@ -572,7 +572,7 @@ ${{{{
__intrinsic_op($(kIROp_Rsh)) This shr(int other);
__intrinsic_op($(kIROp_BitAnd)) This bitAnd(This other);
__intrinsic_op($(kIROp_BitOr)) This bitOr(This other);
- [__unsafeForceInlineEarly] This and(This other) {return __intCast<This>(__intCast<bool>(this) && __intCast<bool>(other)); }
+ [__unsafeForceInlineEarly] This and(This other) {return __intCast<This>(and(__intCast<bool>(this), __intCast<bool>(other))); }
[__unsafeForceInlineEarly] This or(This other) {return __intCast<This>(__intCast<bool>(this) || __intCast<bool>(other)); }
__intrinsic_op($(kIROp_BitXor)) This bitXor(This other);
__intrinsic_op($(kIROp_BitNot)) This bitNot();
@@ -2228,6 +2228,14 @@ T operator &&(T v0, T v1)
{
return v0.and(v1);
}
+
+[__unsafeForceInlineEarly]
+[OverloadRank(-10)]
+bool and(bool v0, bool v1)
+{
+ return __and(v0, v1);
+}
+
__generic<T : ILogical>
[__unsafeForceInlineEarly]
[OverloadRank(-10)]