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

Prevent crash when bad shader redeclares built-in array names it is not supposed to redeclare.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@26520 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2014-05-06 22:58:55 +00:00
parent 8a1a4a7a8b
commit d7dfe2c2b2
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Test/400.tese
View File

@@ -97,3 +97,5 @@ layout(location = 24) in vec4 ivlc[]; // ERROR
layout(location = 23) out vec4 ovla[2]; layout(location = 23) out vec4 ovla[2];
layout(location = 24) out vec4 ovlb[2]; // ERROR layout(location = 24) out vec4 ovlb[2]; // ERROR
in float gl_TessLevelOuter[4]; // ERROR

3
Test/baseResults/150.tesc.out
View File

@@ -388,7 +388,8 @@ ERROR: 0:78: 'in' : type must be an array: bla
ERROR: 0:86: '[]' : tessellation input array size must be gl_MaxPatchVertices or implicitly sized ERROR: 0:86: '[]' : tessellation input array size must be gl_MaxPatchVertices or implicitly sized
ERROR: 0:96: 'location' : overlapping use of location 24 ERROR: 0:96: 'location' : overlapping use of location 24
ERROR: 0:99: 'location' : overlapping use of location 24 ERROR: 0:99: 'location' : overlapping use of location 24
ERROR: 29 compilation errors. No code generated. ERROR: 0:101: 'gl_TessLevelOuter' : identifiers starting with "gl_" are reserved
ERROR: 30 compilation errors. No code generated.
Shader version: 400 Shader version: 400

3
Test/baseResults/400.tese.out
View File

@@ -29,7 +29,8 @@ ERROR: 0:78: 'in' : type must be an array: bla
ERROR: 0:86: '[]' : tessellation input array size must be gl_MaxPatchVertices or implicitly sized ERROR: 0:86: '[]' : tessellation input array size must be gl_MaxPatchVertices or implicitly sized
ERROR: 0:96: 'location' : overlapping use of location 24 ERROR: 0:96: 'location' : overlapping use of location 24
ERROR: 0:99: 'location' : overlapping use of location 24 ERROR: 0:99: 'location' : overlapping use of location 24
ERROR: 29 compilation errors. No code generated. ERROR: 0:101: 'gl_TessLevelOuter' : identifiers starting with "gl_" are reserved
ERROR: 30 compilation errors. No code generated.
Shader version: 400 Shader version: 400

5
glslang/MachineIndependent/ParseHelper.cpp
View File

@@ -2213,6 +2213,11 @@ void TParseContext::declareArray(TSourceLoc loc, TString& identifier, const TTyp
if (! symbol) { if (! symbol) {
bool currentScope; bool currentScope;
symbol = symbolTable.find(identifier, 0, &currentScope); symbol = symbolTable.find(identifier, 0, &currentScope);
if (symbol && builtInName(identifier) && ! symbolTable.atBuiltInLevel()) {
// bad shader (errors already reported) trying to redeclare a built-in name as an array
return;
}
if (symbol == 0 || ! currentScope) { if (symbol == 0 || ! currentScope) {
// //
// Successfully process a new definition. // Successfully process a new definition.