mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update rules for "GL_", "gl_", and "__" to match latest specification bug fixes.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@25392 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2014-02-18 21:55:42 +00:00
parent 3bef952d48
commit 52c351442c
7 changed files with 92 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glslang/Include/revision.h
View File

@@ -9,5 +9,5 @@
// source have to figure out how to create revision.h just to get a build
// going. However, if it is not updated, it can be a version behind.
#define GLSLANG_REVISION "25314"
#define GLSLANG_DATE "2014/02/11 22:15:49"
#define GLSLANG_REVISION "25351"
#define GLSLANG_DATE "2014/02/13 12:14:33"

26
glslang/MachineIndependent/ParseHelper.cpp
View File

@@ -1486,17 +1486,21 @@ void TParseContext::globalCheck(TSourceLoc loc, const char* token)
}
//
// If it starts "gl_" or has double underscore, it's a reserved name.
// Except, if the symbol table is at a built-in level,
// which is when we are parsing built-ins.
// Reserved errors for GLSL.
//
void TParseContext::reservedErrorCheck(TSourceLoc loc, const TString& identifier)
{
// "Identifiers starting with "gl_" are reserved for use by OpenGL, and may not be
// declared in a shader; this results in a compile-time error."
if (! symbolTable.atBuiltInLevel()) {
if (builtInName(identifier))
error(loc, "reserved built-in name:", "gl_", identifier.c_str());
error(loc, "identifiers starting with \"gl_\" are reserved", identifier.c_str(), "");
// "In addition, all identifiers containing two consecutive underscores (__) are
// reserved; using such a name does not itself result in an error, but may result
// in undefined behavior."
if (identifier.find("__") != TString::npos)
error(loc, "Two consecutive underscores are reserved for future use.", identifier.c_str(), "", "");
warn(loc, "identifiers containing consecutive underscores (\"__\") are reserved", identifier.c_str(), "");
}
}
@@ -1505,13 +1509,15 @@ void TParseContext::reservedErrorCheck(TSourceLoc loc, const TString& identifier
//
void TParseContext::reservedPpErrorCheck(TSourceLoc loc, const char* identifier, const char* op)
{
// "All macro names containing two consecutive underscores ( __ ) are reserved for future use as predefined
// macro names. All macro names prefixed with "GL_" ("GL" followed by a single underscore) are also
// reserved."
// "All macro names containing two consecutive underscores ( __ ) are reserved;
// defining such a name does not itself result in an error, but may result in
// undefined behavior. All macro names prefixed with "GL_" ("GL" followed by a
// single underscore) are also reserved, and defining such a name results in a
// compile-time error."
if (strncmp(identifier, "GL_", 3) == 0)
error(loc, "can't use with built-in names (\"GL_\" prefix)", op, "");
error(loc, "names beginning with \"GL_\" can't be defined:", op, identifier);
else if (strstr(identifier, "__") != 0)
error(loc, "can't use with built-in names (containing consecutive underscores)", op, "");
warn(loc, "names containing consecutive underscores are reserved:", op, identifier);
}
//