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

SPV: Correctly enforce 'location' presence on in/out blocks.

Browse source 
Blocks have this on members, not the object.
This commit is contained in:
John Kessenich 2017-05-20 12:14:13 -06:00
parent 557caf2401
commit 1d585ac8bd
3 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
glslang/MachineIndependent/ParseHelper.cpp
View file

@ -4332,14 +4332,19 @@ void TParseContext::layoutObjectCheck(const TSourceLoc& loc, const TSymbol& symb
default:
break;
}
} else if (spvVersion.spv > 0) {
}
// user-variable location check, which are required for SPIR-V in/out:
// - variables have it directly,
// - blocks have it on each member (already enforced), so check first one
if (spvVersion.spv > 0 && !parsingBuiltins && qualifier.builtIn == EbvNone &&
!qualifier.hasLocation() && !intermediate.getAutoMapLocations()) {
switch (qualifier.storage) {
case EvqVaryingIn:
case EvqVaryingOut:
if (! parsingBuiltins && qualifier.builtIn == EbvNone) {
if (!intermediate.getAutoMapLocations())
error(loc, "SPIR-V requires location for user input/output", "location", "");
}
if (type.getBasicType() != EbtBlock || !(*type.getStruct())[0].type->getQualifier().hasLocation())
error(loc, "SPIR-V requires location for user input/output", "location", "");
break;
default:
break;