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

Merge pull request #746 from dgkoch/dgkoch_build_fixes

Browse Source 
Fix build warnings on some platforms
This commit is contained in:
John Kessenich 2017-03-01 13:14:51 -07:00 committed by GitHub
commit 9c3f7b60ae
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glslang/MachineIndependent/preprocessor/Pp.cpp
View File

@ -1052,7 +1052,7 @@ int TPpContext::tMacroInput::scan(TPpToken* ppToken)
// TODO: preprocessor: properly handle whitespace (or lack of it) between tokens when expanding // TODO: preprocessor: properly handle whitespace (or lack of it) between tokens when expanding
if (token == PpAtomIdentifier) { if (token == PpAtomIdentifier) {
int i; int i;
for (i = mac->args.size() - 1; i >= 0; i--) for (i = (int)mac->args.size() - 1; i >= 0; i--)
if (strcmp(pp->atomStrings.getString(mac->args[i]), ppToken->name) == 0) if (strcmp(pp->atomStrings.getString(mac->args[i]), ppToken->name) == 0)
break; break;
if (i >= 0) { if (i >= 0) {

4
hlsl/hlslParseHelper.cpp
View File

@ -2452,7 +2452,7 @@ void HlslParseContext::decomposeStructBufferMethods(const TSourceLoc& loc, TInte
case EOpMethodGetDimensions: case EOpMethodGetDimensions:
{ {
const int numArgs = argAggregate->getSequence().size(); const int numArgs = (int)argAggregate->getSequence().size();
TIntermTyped* argNumItems = argAggregate->getSequence()[1]->getAsTyped(); // out num items TIntermTyped* argNumItems = argAggregate->getSequence()[1]->getAsTyped(); // out num items
TIntermTyped* argStride = numArgs > 2 ? argAggregate->getSequence()[2]->getAsTyped() : nullptr; // out stride TIntermTyped* argStride = numArgs > 2 ? argAggregate->getSequence()[2]->getAsTyped() : nullptr; // out stride
@ -3754,7 +3754,7 @@ TIntermTyped* HlslParseContext::handleFunctionCall(const TSourceLoc& loc, TFunct
// Find it in the symbol table. // Find it in the symbol table.
// //
const TFunction* fnCandidate = nullptr; const TFunction* fnCandidate = nullptr;
bool builtIn; bool builtIn = false;
// TODO: this needs improvement: there's no way at present to look up a signature in // TODO: this needs improvement: there's no way at present to look up a signature in
// the symbol table for an arbitrary type. This is a temporary hack until that ability exists. // the symbol table for an arbitrary type. This is a temporary hack until that ability exists.