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

Build: Tweak PR #1808 to avoid an implicit conversion warning.

Browse Source
This commit is contained in:
John Kessenich 2019-07-02 01:51:50 -06:00
parent 4162de4bbf
commit 73f0108138
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glslang/MachineIndependent/Intermediate.cpp
View File

@ -3790,6 +3790,7 @@ TIntermTyped* TIntermediate::promoteConstantUnion(TBasicType promoteTo, TIntermC
for (int i=0; i < size; i++) { for (int i=0; i < size; i++) {
#define PROMOTE(Set, CType, Get) leftUnionArray[i].Set(static_cast<CType>(rightUnionArray[i].Get())) #define PROMOTE(Set, CType, Get) leftUnionArray[i].Set(static_cast<CType>(rightUnionArray[i].Get()))
#define PROMOTE_TO_BOOL(Get) leftUnionArray[i].setBConst(rightUnionArray[i].Get() != 0)
#define TO_ALL(Get) \ #define TO_ALL(Get) \
switch (promoteTo) { \ switch (promoteTo) { \
@ -3804,7 +3805,7 @@ TIntermTyped* TIntermediate::promoteConstantUnion(TBasicType promoteTo, TIntermC
case EbtUint16: PROMOTE(setU16Const, unsigned short, Get); break; \ case EbtUint16: PROMOTE(setU16Const, unsigned short, Get); break; \
case EbtUint: PROMOTE(setUConst, unsigned int, Get); break; \ case EbtUint: PROMOTE(setUConst, unsigned int, Get); break; \
case EbtUint64: PROMOTE(setU64Const, unsigned long long, Get); break; \ case EbtUint64: PROMOTE(setU64Const, unsigned long long, Get); break; \
case EbtBool: PROMOTE(setBConst, bool, Get); break; \ case EbtBool: PROMOTE_TO_BOOL(Get); break; \
default: return node; \ default: return node; \
} }