From 73f010813812ec9177eaa6bb16bff6258f7885f2 Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Tue, 2 Jul 2019 01:51:50 -0600 Subject: [PATCH] Build: Tweak PR #1808 to avoid an implicit conversion warning. --- glslang/MachineIndependent/Intermediate.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glslang/MachineIndependent/Intermediate.cpp b/glslang/MachineIndependent/Intermediate.cpp index e20068f0..d841c905 100644 --- a/glslang/MachineIndependent/Intermediate.cpp +++ b/glslang/MachineIndependent/Intermediate.cpp @@ -3790,6 +3790,7 @@ TIntermTyped* TIntermediate::promoteConstantUnion(TBasicType promoteTo, TIntermC for (int i=0; i < size; i++) { #define PROMOTE(Set, CType, Get) leftUnionArray[i].Set(static_cast(rightUnionArray[i].Get())) +#define PROMOTE_TO_BOOL(Get) leftUnionArray[i].setBConst(rightUnionArray[i].Get() != 0) #define TO_ALL(Get) \ switch (promoteTo) { \ @@ -3804,7 +3805,7 @@ TIntermTyped* TIntermediate::promoteConstantUnion(TBasicType promoteTo, TIntermC case EbtUint16: PROMOTE(setU16Const, unsigned short, Get); break; \ case EbtUint: PROMOTE(setUConst, unsigned int, 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; \ }