SPV: Use OpLogicalEqual/OpLogicalNotEqual for boolean type comparison.
diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index 9d4dc59..07ed51c 100755
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -2633,6 +2633,7 @@
{
bool isUnsigned = typeProxy == glslang::EbtUint;
bool isFloat = typeProxy == glslang::EbtFloat || typeProxy == glslang::EbtDouble;
+ bool isBool = typeProxy == glslang::EbtBool;
spv::Op binOp = spv::OpNop;
bool needMatchingVectors = true; // for non-matrix ops, would a scalar need to smear to match a vector?
@@ -2820,6 +2821,8 @@
case glslang::EOpVectorEqual:
if (isFloat)
binOp = spv::OpFOrdEqual;
+ else if (isBool)
+ binOp = spv::OpLogicalEqual;
else
binOp = spv::OpIEqual;
break;
@@ -2827,6 +2830,8 @@
case glslang::EOpVectorNotEqual:
if (isFloat)
binOp = spv::OpFOrdNotEqual;
+ else if (isBool)
+ binOp = spv::OpLogicalNotEqual;
else
binOp = spv::OpINotEqual;
break;
diff --git a/Test/baseResults/spv.Operations.frag.out b/Test/baseResults/spv.Operations.frag.out
index a586372..f8b666d 100755
--- a/Test/baseResults/spv.Operations.frag.out
+++ b/Test/baseResults/spv.Operations.frag.out
@@ -470,7 +470,7 @@
339: Label
341: 179(bvec4) Load 181(ub41)
343: 179(bvec4) Load 342(ub42)
- 344: 179(bvec4) IEqual 341 343
+ 344: 179(bvec4) LogicalEqual 341 343
345: 178(bool) Any 344
Branch 340
340: Label
@@ -482,7 +482,7 @@
348: Label
350: 179(bvec4) Load 181(ub41)
351: 179(bvec4) Load 342(ub42)
- 352: 179(bvec4) INotEqual 350 351
+ 352: 179(bvec4) LogicalNotEqual 350 351
353: 178(bool) Any 352
Branch 349
349: Label
diff --git a/Test/baseResults/spv.bool.vert.out b/Test/baseResults/spv.bool.vert.out
index f11fe39..b6960f9 100644
--- a/Test/baseResults/spv.bool.vert.out
+++ b/Test/baseResults/spv.bool.vert.out
@@ -91,6 +91,6 @@
9(b): 7(ptr) FunctionParameter
11: Label
12: 6(bool) Load 9(b)
- 14: 6(bool) INotEqual 12 13
+ 14: 6(bool) LogicalNotEqual 12 13
ReturnValue 14
FunctionEnd