AuroraMiddleware/glslang
1
0
Fork 0
mirror of https://github.com/KhronosGroup/glslang synced 2024-11-12 21:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #428 from dankbaker/master

Browse Source 
HLSL: Fixing some casts that warn when compiled to 64 bit (size_t is 64 bit…
This commit is contained in:
John Kessenich 2016-08-02 12:58:22 -06:00 committed by GitHub
commit 6c136223ed
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hlsl/hlslParseHelper.cpp
View File

@ -989,7 +989,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
const TSampler& texSampler = texType.getSampler();
const TSamplerDim dim = texSampler.dim;
const int numArgs = argAggregate->getSequence().size();
const int numArgs = (int) argAggregate->getSequence().size();
int numDims = 0;
@ -1175,7 +1175,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
lodComponent->setType(TType(coordBaseType, EvqTemporary, 1));
}
const int numArgs = argAggregate->getSequence().size();
const int numArgs = (int) argAggregate->getSequence().size();
const bool hasOffset = ((!isMS && numArgs == 3) || (isMS && numArgs == 4));
// Create texel fetch
@ -1219,7 +1219,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
TIntermTyped* argLod = argAggregate->getSequence()[3]->getAsTyped();
TIntermTyped* argOffset = nullptr;
const int numArgs = argAggregate->getSequence().size();
const int numArgs = (int) argAggregate->getSequence().size();
if (numArgs == 5) // offset, if present
argOffset = argAggregate->getSequence()[4]->getAsTyped();