BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GLSL: No more restrictions on (non)shadow sampler construction.

Browse source 
Match https://github.com/KhronosGroup/GLSL/pull/22
This commit is contained in:
John Kessenich 2018-07-25 12:11:04 -06:00
parent 62faea79d7
commit e161cc11f7
3 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
glslang/MachineIndependent/ParseHelper.cpp
View file

@ -2655,19 +2655,12 @@ bool TParseContext::constructorTextureSamplerError(const TSourceLoc& loc, const
// second argument
// * the constructor's second argument must be a scalar of type
// *sampler* or *samplerShadow*
// * if the second argument is *samplerShadow* the constructor must be a
// shadow constructor (however, shadow constructors are allowed to have
// a second argument of *sampler*)
if ( function[1].type->getBasicType() != EbtSampler ||
! function[1].type->getSampler().isPureSampler() ||
function[1].type->isArray()) {
error(loc, "sampler-constructor second argument must be a scalar type 'sampler'", token, "");
return true;
}
if (!function.getType().getSampler().shadow && function[1].type->getSampler().shadow) {
error(loc, "sampler-constructor second argument presence of shadow must match constructor presence of shadow", token, "");
return true;
}
return false;
}