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

Tessellation: Smaller changes: Take tessellation control output arrayness into account in location overlap testing, better error message for redeclaring a built-in with size to be unsized.

Browse source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24522 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-12-13 19:26:54 +00:00
parent f3e2a89452
commit 27151efa71
6 changed files with 31 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
glslang/MachineIndependent/ParseHelper.cpp
View file

@ -2371,10 +2371,14 @@ void TParseContext::redeclareBuiltinBlock(TSourceLoc loc, TTypeList& newTypeList
error(loc, "block redeclaration has extra members", blockName.c_str(), "");
if (type.isArray() != (arraySizes != 0))
error(loc, "cannot change arrayness of redeclared block", blockName.c_str(), "");
else if (type.isArray() && type.getArraySize() > 0 && type.getArraySize() != arraySizes->getSize())
error(loc, "cannot change array size of redeclared block", blockName.c_str(), "");
else if (type.isArray() && type.getArraySize() == 0 && arraySizes->getSize() > 0)
type.changeArraySize(arraySizes->getSize());
else if (type.isArray()) {
if (type.getArraySize() > 0 && arraySizes->getSize() == 0)
error(loc, "block already declared with size, can't redeclare as unsized", blockName.c_str(), "");
else if (type.getArraySize() > 0 && type.getArraySize() != arraySizes->getSize())
error(loc, "cannot change array size of redeclared block", blockName.c_str(), "");
else if (type.getArraySize() == 0 && arraySizes->getSize() > 0)
type.changeArraySize(arraySizes->getSize());
}
symbolTable.insert(*block);
@ -4004,3 +4008,4 @@ TIntermNode* TParseContext::addSwitch(TSourceLoc loc, TIntermTyped* expression,
}
} // end namespace glslang
// TODO: geometry and tessellation: make sure all inputs/outputs that should have extra level of arrayness do have the extra level of arrayness