Merge pull request #466 from baldurk/minor-msvc-warning-fix

fix x64 warning about conversion size_t -> int
This commit is contained in:
John Kessenich 2016-08-15 10:47:28 -06:00 committed by GitHub
commit 15c0fbee32

View file

@ -1346,7 +1346,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
const TSamplerDim dim = argTex->getType().getSampler().dim; const TSamplerDim dim = argTex->getType().getSampler().dim;
const int argSize = argAggregate->getSequence().size(); const int argSize = (int)argAggregate->getSequence().size();
bool hasStatus = (argSize == (5+cmpValues) || argSize == (8+cmpValues)); bool hasStatus = (argSize == (5+cmpValues) || argSize == (8+cmpValues));
bool hasOffset1 = false; bool hasOffset1 = false;
bool hasOffset4 = false; bool hasOffset4 = false;