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

Expose the sampler type from a TType, and add a way to rebuild just the sampler type name for messages/annotation.

Browse source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@20672 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-02-21 17:22:17 +00:00
parent e141d5c99c
commit 6f045f3e72
5 changed files with 42 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
glslang/MachineIndependent/glslang.y
View file

@ -1203,7 +1203,7 @@ function_prototype
TFunction* prevDec = symbol ? symbol->getAsFunction() : 0;
if (prevDec) {
if (prevDec->getReturnType() != $1->getReturnType()) {
parseContext.error($2.line, "overloaded functions must have the same return type", $1->getReturnType().getBasicString(), "");
parseContext.error($2.line, "overloaded functions must have the same return type", $1->getReturnType().getCompleteTypeString().c_str(), "");
parseContext.recover();
}
for (int i = 0; i < prevDec->getParamCount(); ++i) {
@ -2950,7 +2950,7 @@ function_definition
parseContext.recover();
}
if (function.getReturnType().getBasicType() != EbtVoid) {
parseContext.error($1.line, "", function.getReturnType().getBasicString(), "main function cannot return a value");
parseContext.error($1.line, "", function.getReturnType().getCompleteTypeString().c_str(), "main function cannot return a value");
parseContext.recover();
}
}