Merge pull request #2105 from jeffbolznv/nonunif

Allow nonuniformEXT() on sampler types
This commit is contained in:
John Kessenich 2020-03-10 03:50:27 -06:00 committed by GitHub
commit dbb56a1d48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 245 additions and 3 deletions

View file

@ -3089,7 +3089,7 @@ bool TParseContext::constructorError(const TSourceLoc& loc, TIntermNode* node, T
error(loc, "constructor argument does not have a type", "constructor", "");
return true;
}
if (op != EOpConstructStruct && typed->getBasicType() == EbtSampler) {
if (op != EOpConstructStruct && op != EOpConstructNonuniform && typed->getBasicType() == EbtSampler) {
error(loc, "cannot convert a sampler", "constructor", "");
return true;
}