mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Build: Fix build warnings introduced by 2173c6.

Browse Source 
Also bump version for recent changes.
This commit is contained in:
John Kessenich 2018-11-27 07:45:52 -07:00
parent c7a84a9247
commit d41a8dca0c
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glslang/Include/revision.h
View File

@ -1,3 +1,3 @@
// This header is generated by the make-revision script. // This header is generated by the make-revision script.
#define GLSLANG_PATCH_LEVEL 2997 #define GLSLANG_PATCH_LEVEL 3006

22
glslang/MachineIndependent/Constant.cpp Normal file → Executable file
View File

@ -671,27 +671,27 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TType& returnType)
} }
case EOpConvInt8ToBool: case EOpConvInt8ToBool:
newConstArray[i].setBConst(unionArray[i].getI8Const()); break; newConstArray[i].setBConst(unionArray[i].getI8Const() != 0); break;
case EOpConvUint8ToBool: case EOpConvUint8ToBool:
newConstArray[i].setBConst(unionArray[i].getU8Const()); break; newConstArray[i].setBConst(unionArray[i].getU8Const() != 0); break;
case EOpConvInt16ToBool: case EOpConvInt16ToBool:
newConstArray[i].setBConst(unionArray[i].getI16Const()); break; newConstArray[i].setBConst(unionArray[i].getI16Const() != 0); break;
case EOpConvUint16ToBool: case EOpConvUint16ToBool:
newConstArray[i].setBConst(unionArray[i].getU16Const()); break; newConstArray[i].setBConst(unionArray[i].getU16Const() != 0); break;
case EOpConvIntToBool: case EOpConvIntToBool:
newConstArray[i].setBConst(unionArray[i].getIConst()); break; newConstArray[i].setBConst(unionArray[i].getIConst() != 0); break;
case EOpConvUintToBool: case EOpConvUintToBool:
newConstArray[i].setBConst(unionArray[i].getUConst()); break; newConstArray[i].setBConst(unionArray[i].getUConst() != 0); break;
case EOpConvInt64ToBool: case EOpConvInt64ToBool:
newConstArray[i].setBConst(unionArray[i].getI64Const()); break; newConstArray[i].setBConst(unionArray[i].getI64Const() != 0); break;
case EOpConvUint64ToBool: case EOpConvUint64ToBool:
newConstArray[i].setBConst(unionArray[i].getI64Const()); break; newConstArray[i].setBConst(unionArray[i].getI64Const() != 0); break;
case EOpConvFloat16ToBool: case EOpConvFloat16ToBool:
newConstArray[i].setBConst(unionArray[i].getDConst()); break; newConstArray[i].setBConst(unionArray[i].getDConst() != 0); break;
case EOpConvFloatToBool: case EOpConvFloatToBool:
newConstArray[i].setBConst(unionArray[i].getDConst()); break; newConstArray[i].setBConst(unionArray[i].getDConst() != 0); break;
case EOpConvDoubleToBool: case EOpConvDoubleToBool:
newConstArray[i].setBConst(unionArray[i].getDConst()); break; newConstArray[i].setBConst(unionArray[i].getDConst() != 0); break;
case EOpConvBoolToInt8: case EOpConvBoolToInt8:
newConstArray[i].setI8Const(unionArray[i].getBConst()); break; newConstArray[i].setI8Const(unionArray[i].getBConst()); break;