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

fix x64 warning about conversion size_t -> int

Merge pull request #466 from baldurk/minor-msvc-warning-fix
15c0fbee · John Kessenich · GitHub · 7fb66097 · 1eb1c11d · 15c0fbee
Commit 15c0fbee authored Aug 15, 2016 by John Kessenich Committed by GitHub Aug 15, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

hlslParseHelper.cpp hlsl/hlslParseHelper.cpp +1 -1

No files found.
--- a/hlsl/hlslParseHelper.cpp
+++ b/hlsl/hlslParseHelper.cpp
@@ -1346,7 +1346,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType

            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 hasOffset1    = false;
            bool hasOffset4    = false;