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

Build: Reduce warnings.

Browse Source
This commit is contained in:
John Kessenich 2018-12-13 18:43:02 -07:00
parent 236eb0d325
commit 30b697ee63
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -800,32 +800,32 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TType& returnType)
newConstArray[i].setDConst(unionArray[i].getU16Const()); break; newConstArray[i].setDConst(unionArray[i].getU16Const()); break;
case EOpConvIntToInt8: case EOpConvIntToInt8:
newConstArray[i].setI8Const(unionArray[i].getIConst()); break; newConstArray[i].setI8Const((signed char)unionArray[i].getIConst()); break;
case EOpConvIntToInt16: case EOpConvIntToInt16:
newConstArray[i].setI16Const(unionArray[i].getIConst()); break; newConstArray[i].setI16Const((signed short)unionArray[i].getIConst()); break;
case EOpConvIntToInt64: case EOpConvIntToInt64:
newConstArray[i].setI64Const(unionArray[i].getIConst()); break; newConstArray[i].setI64Const(unionArray[i].getIConst()); break;
case EOpConvIntToUint8: case EOpConvIntToUint8:
newConstArray[i].setU8Const(unionArray[i].getIConst()); break; newConstArray[i].setU8Const((unsigned char)unionArray[i].getIConst()); break;
case EOpConvIntToUint16: case EOpConvIntToUint16:
newConstArray[i].setU16Const(unionArray[i].getIConst()); break; newConstArray[i].setU16Const((unsigned char)unionArray[i].getIConst()); break;
case EOpConvIntToUint: case EOpConvIntToUint:
newConstArray[i].setUConst(unionArray[i].getIConst()); break; newConstArray[i].setUConst(unionArray[i].getIConst()); break;
case EOpConvIntToUint64: case EOpConvIntToUint64:
newConstArray[i].setU64Const(unionArray[i].getIConst()); break; newConstArray[i].setU64Const(unionArray[i].getIConst()); break;
case EOpConvUintToInt8: case EOpConvUintToInt8:
newConstArray[i].setI8Const(unionArray[i].getUConst()); break; newConstArray[i].setI8Const((signed char)unionArray[i].getUConst()); break;
case EOpConvUintToInt16: case EOpConvUintToInt16:
newConstArray[i].setI16Const(unionArray[i].getUConst()); break; newConstArray[i].setI16Const((signed short)unionArray[i].getUConst()); break;
case EOpConvUintToInt: case EOpConvUintToInt:
newConstArray[i].setIConst(unionArray[i].getUConst()); break; newConstArray[i].setIConst(unionArray[i].getUConst()); break;
case EOpConvUintToInt64: case EOpConvUintToInt64:
newConstArray[i].setI64Const(unionArray[i].getUConst()); break; newConstArray[i].setI64Const(unionArray[i].getUConst()); break;
case EOpConvUintToUint8: case EOpConvUintToUint8:
newConstArray[i].setU8Const(unionArray[i].getUConst()); break; newConstArray[i].setU8Const((unsigned char)unionArray[i].getUConst()); break;
case EOpConvUintToUint16: case EOpConvUintToUint16:
newConstArray[i].setU16Const(unionArray[i].getUConst()); break; newConstArray[i].setU16Const((unsigned short)unionArray[i].getUConst()); break;
case EOpConvUintToUint64: case EOpConvUintToUint64:
newConstArray[i].setU64Const(unionArray[i].getUConst()); break; newConstArray[i].setU64Const(unionArray[i].getUConst()); break;
case EOpConvIntToFloat16: case EOpConvIntToFloat16:

3
glslang/MachineIndependent/preprocessor/Pp.cpp Normal file → Executable file
View File

@ -1121,7 +1121,8 @@ int TPpContext::tZeroInput::scan(TPpToken* ppToken)
if (done) if (done)
return EndOfInput; return EndOfInput;
strcpy(ppToken->name, "0"); ppToken->name[0] = '0';
ppToken->name[1] = 0;
ppToken->ival = 0; ppToken->ival = 0;
ppToken->space = false; ppToken->space = false;
done = true; done = true;