diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 0521e2e8..3cdfdb01 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // For the version, it uses the latest git tag followed by the number of commits. // For the date, it uses the current date (when then script is run). -#define GLSLANG_REVISION "Overload400-PrecQual.1560" -#define GLSLANG_DATE "07-Oct-2016" +#define GLSLANG_REVISION "Overload400-PrecQual.1601" +#define GLSLANG_DATE "16-Oct-2016" diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index b7ee7f40..78f18b67 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -1444,7 +1444,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType // Sampler return must always be a vec4, but we can construct a shorter vector result->setType(TType(node->getType().getBasicType(), EvqTemporary, node->getVectorSize())); - if (sampler.vectorSize < node->getVectorSize()) { + if (sampler.vectorSize < (unsigned)node->getVectorSize()) { // Too many components. Construct shorter vector from it. const TType clampedType(result->getType().getBasicType(), EvqTemporary, sampler.vectorSize);