diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index dcd52607..eafb8f61 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -1,3 +1,3 @@ // This header is generated by the make-revision script. -#define GLSLANG_PATCH_LEVEL 2997 +#define GLSLANG_PATCH_LEVEL 3006 diff --git a/glslang/MachineIndependent/Constant.cpp b/glslang/MachineIndependent/Constant.cpp old mode 100644 new mode 100755 index 2c5aea8e..8d4987b7 --- a/glslang/MachineIndependent/Constant.cpp +++ b/glslang/MachineIndependent/Constant.cpp @@ -671,27 +671,27 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TType& returnType) } case EOpConvInt8ToBool: - newConstArray[i].setBConst(unionArray[i].getI8Const()); break; + newConstArray[i].setBConst(unionArray[i].getI8Const() != 0); break; case EOpConvUint8ToBool: - newConstArray[i].setBConst(unionArray[i].getU8Const()); break; + newConstArray[i].setBConst(unionArray[i].getU8Const() != 0); break; case EOpConvInt16ToBool: - newConstArray[i].setBConst(unionArray[i].getI16Const()); break; + newConstArray[i].setBConst(unionArray[i].getI16Const() != 0); break; case EOpConvUint16ToBool: - newConstArray[i].setBConst(unionArray[i].getU16Const()); break; + newConstArray[i].setBConst(unionArray[i].getU16Const() != 0); break; case EOpConvIntToBool: - newConstArray[i].setBConst(unionArray[i].getIConst()); break; + newConstArray[i].setBConst(unionArray[i].getIConst() != 0); break; case EOpConvUintToBool: - newConstArray[i].setBConst(unionArray[i].getUConst()); break; + newConstArray[i].setBConst(unionArray[i].getUConst() != 0); break; case EOpConvInt64ToBool: - newConstArray[i].setBConst(unionArray[i].getI64Const()); break; + newConstArray[i].setBConst(unionArray[i].getI64Const() != 0); break; case EOpConvUint64ToBool: - newConstArray[i].setBConst(unionArray[i].getI64Const()); break; + newConstArray[i].setBConst(unionArray[i].getI64Const() != 0); break; case EOpConvFloat16ToBool: - newConstArray[i].setBConst(unionArray[i].getDConst()); break; + newConstArray[i].setBConst(unionArray[i].getDConst() != 0); break; case EOpConvFloatToBool: - newConstArray[i].setBConst(unionArray[i].getDConst()); break; + newConstArray[i].setBConst(unionArray[i].getDConst() != 0); break; case EOpConvDoubleToBool: - newConstArray[i].setBConst(unionArray[i].getDConst()); break; + newConstArray[i].setBConst(unionArray[i].getDConst() != 0); break; case EOpConvBoolToInt8: newConstArray[i].setI8Const(unionArray[i].getBConst()); break;