Skip to content

G
glslang
Commit e7c59c18 by John Kessenich
Options

Add all built-in variables for all versions/profiles/stages of GLSL. Also, made…

Add all built-in variables for all versions/profiles/stages of GLSL. Also, made more readable; declarations are cut and paste from the specs, with quotes around them. This does not include built-in constants yet (other than MaxClipDistances), just the non-constants. git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@23551 e7fa87d3-cd2b-0410-9028-fcbf551c1848
parent 457145de
Showing with 1399 additions and 859 deletions
StandAlone/StandAlone.cpp
...@@ -127,6 +127,7 @@ const char* DefaultConfig = ...@@ -127,6 +127,7 @@ const char* DefaultConfig =
"MaxFragmentInputVectors 15\n" "MaxFragmentInputVectors 15\n"
"MinProgramTexelOffset -8\n" "MinProgramTexelOffset -8\n"
"MaxProgramTexelOffset 7\n" "MaxProgramTexelOffset 7\n"
"MaxClipDistances 8\n"
"nonInductiveForLoops 1\n" "nonInductiveForLoops 1\n"
"whileLoops 1\n" "whileLoops 1\n"
"doWhileLoops 1\n" "doWhileLoops 1\n"
...@@ -208,6 +209,8 @@ void ProcessConfigFile() ...@@ -208,6 +209,8 @@ void ProcessConfigFile()
Resources.minProgramTexelOffset = value; Resources.minProgramTexelOffset = value;
else if (strcmp(token, "MaxProgramTexelOffset") == 0) else if (strcmp(token, "MaxProgramTexelOffset") == 0)
Resources.maxProgramTexelOffset = value; Resources.maxProgramTexelOffset = value;
else if (strcmp(token, "MaxClipDistances") == 0)
Resources.maxClipDistances = value;
else if (strcmp(token, "nonInductiveForLoops") == 0) else if (strcmp(token, "nonInductiveForLoops") == 0)
Resources.limits.nonInductiveForLoops = (value != 0); Resources.limits.nonInductiveForLoops = (value != 0);
else if (strcmp(token, "whileLoops") == 0) else if (strcmp(token, "whileLoops") == 0)
......
Test/120.vert
...@@ -17,6 +17,9 @@ void main() ...@@ -17,6 +17,9 @@ void main()
centTexCoord = attv2; centTexCoord = attv2;
gl_Position = attv4; gl_Position = attv4;
gl_ClipVertex = attv4;
gl_ClipDistance[1] = 0.2; // ERROR
vec3[12] a; vec3[12] a;
vec4[a.length()] b; vec4[a.length()] b;
gl_Position = b[b.length()-1]; gl_Position = b[b.length()-1];
......
Test/130.frag
...@@ -15,4 +15,5 @@ noperspective in float fnop; ...@@ -15,4 +15,5 @@ noperspective in float fnop;
void main() void main()
{ {
float clip = gl_ClipDistance[3];
} }
Test/140.frag
...@@ -5,8 +5,11 @@ varying vec4 v; ...@@ -5,8 +5,11 @@ varying vec4 v;
in vec4 i; in vec4 i;
out vec4 o; out vec4 o;
in float gl_ClipDistance[5];
void main() void main()
{ {
float clip = gl_ClipDistance[2];
} }
#ifdef GL_ES #ifdef GL_ES
#error GL_ES is set #error GL_ES is set
......
Test/150.geom
#version 150 core #version 150 core
in fromVertex {
vec3 color;
} fromV;
out toFragment {
vec3 color;
} toF;
out fromVertex { // okay to reuse a block name for another block name
vec3 color;
};
out fooB {
vec2 color;
} fromVertex; // ERROR, cannot reuse block name as block instance
int fromVertex; // ERROR, cannot reuse a block name for something else
out fooC {
vec2 color;
} fooC; // ERROR, cannot have same name for block and instance name
void main() void main()
{ {
EmitVertex(); EmitVertex();
EndPrimitive(); EndPrimitive();
EmitStreamVertex(1); // ERROR EmitStreamVertex(1); // ERROR
EndStreamPrimitive(0); // ERROR EndStreamPrimitive(0); // ERROR
color = fromV.color;
gl_ClipDistance[3] = gl_in[1].gl_ClipDistance[2];
gl_Position = gl_in[0].gl_Position;
gl_PointSize = gl_in[3].gl_PointSize;
gl_PrimitiveID = gl_PrimitiveIDIn;
gl_Layer = 2;
} }
Test/400.frag
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
in vec2 c2D; in vec2 c2D;
flat in int i; flat in int i;
out vec4 outp;
uniform sampler2D arrayedSampler[5]; uniform sampler2D arrayedSampler[5];
void main() void main()
{ {
vec4 v; vec4 v;
v = texture(arrayedSampler[i], c2D); v = texture(arrayedSampler[i], c2D);
outp.x = gl_ClipDistance[1];
} }
Test/400.geom
...@@ -6,4 +6,6 @@ void main() ...@@ -6,4 +6,6 @@ void main()
EndStreamPrimitive(0); EndStreamPrimitive(0);
EmitVertex(); EmitVertex();
EndPrimitive(); EndPrimitive();
int id = gl_InvocationID;
} }
Test/baseResults/120.vert.out
...@@ -5,30 +5,33 @@ ERROR: 0:11: 'gl_Position' : cannot add storage, auxiliary, memory, interpolatio ...@@ -5,30 +5,33 @@ ERROR: 0:11: 'gl_Position' : cannot add storage, auxiliary, memory, interpolatio
ERROR: 0:12: '' : can only have one auxiliary qualifier (centroid, patch, and sample) ERROR: 0:12: '' : can only have one auxiliary qualifier (centroid, patch, and sample)
ERROR: 0:12: '' : replicated qualifiers ERROR: 0:12: '' : replicated qualifiers
ERROR: 0:12: 'foo' : identifier not previously declared ERROR: 0:12: 'foo' : identifier not previously declared
ERROR: 0:25: 'length' : array must be declared with a size before using this method ERROR: 0:21: 'gl_ClipDistance' : undeclared identifier
ERROR: 0:28: 'length' : incomplete method syntax ERROR: 0:21: 'gl_ClipDistance' : left of '[' is not of type array, matrix, or vector
ERROR: 0:29: 'length' : method does not accept any arguments ERROR: 0:21: 'assign' : l-value required (can't modify a const)
ERROR: 0:30: 'flizbit' : only the length method is supported for array ERROR: 0:28: 'length' : array must be declared with a size before using this method
ERROR: 0:30: '=' : cannot convert from '7-element array of float' to 'int' ERROR: 0:31: 'length' : incomplete method syntax
ERROR: 0:31: 'flizbit' : only the length method is supported for array ERROR: 0:32: 'length' : method does not accept any arguments
ERROR: 0:31: 'f' : no matching overloaded function found ERROR: 0:33: 'flizbit' : only the length method is supported for array
ERROR: 0:31: 'a4' : redefinition ERROR: 0:33: '=' : cannot convert from '7-element array of float' to 'int'
ERROR: 0:32: 'arrays of arrays' : not supported with this profile: none ERROR: 0:34: 'flizbit' : only the length method is supported for array
ERROR: 0:33: 'arrays of arrays' : not supported with this profile: none ERROR: 0:34: 'f' : no matching overloaded function found
ERROR: 0:34: 'arrays of arrays' : not supported with this profile: none ERROR: 0:34: 'a4' : redefinition
ERROR: 0:35: 'arrays of arrays' : not supported with this profile: none ERROR: 0:35: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:36: 'arrays of arrays' : not supported with this profile: none ERROR: 0:36: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:37: 'arrays of arrays' : not supported with this profile: none ERROR: 0:37: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:37: 'constructor' : array constructor needs one argument per array element
ERROR: 0:37: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:38: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:38: 'constructor' : array constructor needs one argument per array element
ERROR: 0:38: 'arrays of arrays' : not supported with this profile: none ERROR: 0:38: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:47: 'arrays of arrays' : not supported with this profile: none ERROR: 0:39: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:48: 'arrays of arrays' : not supported with this profile: none ERROR: 0:40: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:49: 'arrays of arrays' : not supported with this profile: none ERROR: 0:40: 'constructor' : array constructor needs one argument per array element
ERROR: 0:40: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:41: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:41: 'constructor' : array constructor needs one argument per array element
ERROR: 0:41: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:50: 'arrays of arrays' : not supported with this profile: none ERROR: 0:50: 'arrays of arrays' : not supported with this profile: none
ERROR: 29 compilation errors. No code generated. ERROR: 0:51: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:52: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:53: 'arrays of arrays' : not supported with this profile: none
ERROR: 32 compilation errors. No code generated.
ERROR: node is still EOpNull! ERROR: node is still EOpNull!
0:15 Function Definition: main( (void) 0:15 Function Definition: main( (void)
...@@ -40,42 +43,50 @@ ERROR: node is still EOpNull! ...@@ -40,42 +43,50 @@ ERROR: node is still EOpNull!
0:18 move second child to first child (4-component vector of float) 0:18 move second child to first child (4-component vector of float)
0:18 'gl_Position' (invariant gl_Position 4-component vector of float) 0:18 'gl_Position' (invariant gl_Position 4-component vector of float)
0:18 'attv4' (in 4-component vector of float) 0:18 'attv4' (in 4-component vector of float)
0:22 move second child to first child (4-component vector of float) 0:20 move second child to first child (4-component vector of float)
0:22 'gl_Position' (invariant gl_Position 4-component vector of float) 0:20 'gl_ClipVertex' (gl_ClipVertex 4-component vector of float)
0:22 direct index (4-component vector of float) 0:20 'attv4' (in 4-component vector of float)
0:22 'b' (12-element array of 4-component vector of float) 0:21 move second child to first child (float)
0:22 Constant: 0:21 Constant:
0:22 11 (const int) 0:21 0.000000
0:25 Sequence 0:21 Constant:
0:25 move second child to first child (int) 0:21 0.200000
0:25 'a1' (int) 0:25 move second child to first child (4-component vector of float)
0:25 'gl_Position' (invariant gl_Position 4-component vector of float)
0:25 direct index (4-component vector of float)
0:25 'b' (12-element array of 4-component vector of float)
0:25 Constant: 0:25 Constant:
0:25 1 (const int) 0:25 11 (const int)
0:27 Sequence
0:27 move second child to first child (int)
0:27 'aa' (int)
0:27 Constant:
0:27 7 (const int)
0:28 Sequence 0:28 Sequence
0:28 move second child to first child (int) 0:28 move second child to first child (int)
0:28 'a2' (int) 0:28 'a1' (int)
0:29 Sequence 0:28 Constant:
0:29 move second child to first child (int) 0:28 1 (const int)
0:29 'a3' (int) 0:30 Sequence
0:29 Constant: 0:30 move second child to first child (int)
0:29 12 (const int) 0:30 'aa' (int)
0:37 Sequence 0:30 Constant:
0:37 move second child to first child (2-element array of float) 0:30 7 (const int)
0:37 'md9' (2-element array of float) 0:31 Sequence
0:37 Construct float (const 2-element array of float) 0:31 move second child to first child (int)
0:38 Sequence 0:31 'a2' (int)
0:38 move second child to first child (2-element array of float) 0:32 Sequence
0:38 'md11' (2-element array of float) 0:32 move second child to first child (int)
0:38 Construct float (const 2-element array of float) 0:32 'a3' (int)
0:40 move second child to first child (float) 0:32 Constant:
0:40 'gl_PointSize' (invariant gl_PointSize float) 0:32 12 (const int)
0:40 Constant: 0:40 Sequence
0:40 3.800000 0:40 move second child to first child (2-element array of float)
0:40 'md9' (2-element array of float)
0:40 Construct float (const 2-element array of float)
0:41 Sequence
0:41 move second child to first child (2-element array of float)
0:41 'md11' (2-element array of float)
0:41 Construct float (const 2-element array of float)
0:43 move second child to first child (float)
0:43 'gl_PointSize' (invariant gl_PointSize float)
0:43 Constant:
0:43 3.800000
0:? Linker Objects 0:? Linker Objects
0:? 'i' (in 4-component vector of float) 0:? 'i' (in 4-component vector of float)
0:? 'o' (smooth out 4-component vector of float) 0:? 'o' (smooth out 4-component vector of float)
......
Test/baseResults/130.frag.out
...@@ -2,6 +2,14 @@ Warning, version 130 is not yet complete; most features are present, but a few a ...@@ -2,6 +2,14 @@ Warning, version 130 is not yet complete; most features are present, but a few a
0:? Sequence 0:? Sequence
0:16 Function Definition: main( (void) 0:16 Function Definition: main( (void)
0:16 Function Parameters: 0:16 Function Parameters:
0:18 Sequence
0:18 Sequence
0:18 move second child to first child (float)
0:18 'clip' (float)
0:18 direct index (smooth in float)
0:18 'gl_ClipDistance' (smooth in unsized array of float)
0:18 Constant:
0:18 3 (const int)
0:? Linker Objects 0:? Linker Objects
0:? 'a' (3-component vector of float) 0:? 'a' (3-component vector of float)
0:? 'b' (float) 0:? 'b' (float)
......
Test/baseResults/140.frag.out
Warning, version 140 is not yet complete; most features are present, but a few are missing. Warning, version 140 is not yet complete; most features are present, but a few are missing.
WARNING: 0:3: varying deprecated in version 130; may be removed in future release WARNING: 0:3: varying deprecated in version 130; may be removed in future release
ERROR: 0:14: '#error' : GL_ES is not set ERROR: 0:17: '#error' : GL_ES is not set
ERROR: 1 compilation errors. No code generated. ERROR: 1 compilation errors. No code generated.
ERROR: node is still EOpNull! ERROR: node is still EOpNull!
0:8 Function Definition: main( (void) 0:10 Function Definition: main( (void)
0:8 Function Parameters: 0:10 Function Parameters:
0:12 Sequence
0:12 Sequence
0:12 move second child to first child (float)
0:12 'clip' (float)
0:12 direct index (smooth in float)
0:12 'gl_ClipDistance' (smooth in 5-element array of float)
0:12 Constant:
0:12 2 (const int)
0:? Linker Objects 0:? Linker Objects
0:? 'v' (smooth in 4-component vector of float) 0:? 'v' (smooth in 4-component vector of float)
0:? 'i' (smooth in 4-component vector of float) 0:? 'i' (smooth in 4-component vector of float)
0:? 'o' (out 4-component vector of float) 0:? 'o' (out 4-component vector of float)
0:? 'gl_ClipDistance' (smooth in 5-element array of float)
Test/baseResults/150.geom.out
Warning, version 150 is not yet complete; some version-specific features are present, but many are missing. Warning, version 150 is not yet complete; some version-specific features are present, but many are missing.
ERROR: 0:7: 'EmitStreamVertex' : no matching overloaded function found ERROR: 0:15: 'fromVertex' : block instance name redefinition
ERROR: 0:8: 'EndStreamPrimitive' : no matching overloaded function found ERROR: 0:19: 'fromVertex' : redefinition
ERROR: 2 compilation errors. No code generated. ERROR: 0:21: 'fooC' : block instance name redefinition
ERROR: 0:29: 'EmitStreamVertex' : no matching overloaded function found
ERROR: 0:30: 'EndStreamPrimitive' : no matching overloaded function found
ERROR: 5 compilation errors. No code generated.
ERROR: node is still EOpNull! ERROR: node is still EOpNull!
0:3 Function Definition: main( (void) 0:25 Function Definition: main( (void)
0:3 Function Parameters: 0:25 Function Parameters:
0:5 Sequence 0:27 Sequence
0:5 EmitVertex (void) 0:27 EmitVertex (void)
0:6 EndPrimitive (void) 0:28 EndPrimitive (void)
0:7 Constant: 0:29 Constant:
0:7 0.000000 0:29 0.000000
0:8 Constant: 0:30 Constant:
0:8 0.000000 0:30 0.000000
0:32 move second child to first child (3-component vector of float)
0:32 color: direct index for structure (3-component vector of float)
0:32 '__anon__0' (out block)
0:32 Constant:
0:32 0 (const uint)
0:32 color: direct index for structure (3-component vector of float)
0:32 'fromV' (in block)
0:32 Constant:
0:32 0 (const int)
0:33 move second child to first child (float)
0:33 direct index (float)
0:33 gl_ClipDistance: direct index for structure (unsized array of float)
0:33 '__anon__1' (out block)
0:33 Constant:
0:33 2 (const uint)
0:33 Constant:
0:33 3 (const int)
0:33 direct index (float)
0:33 gl_ClipDistance: direct index for structure (unsized array of float)
0:33 direct index (in block)
0:33 'gl_in' (in unsized array of block)
0:33 Constant:
0:33 1 (const int)
0:33 Constant:
0:33 2 (const int)
0:33 Constant:
0:33 2 (const int)
0:34 move second child to first child (4-component vector of float)
0:34 gl_Position: direct index for structure (4-component vector of float)
0:34 '__anon__1' (out block)
0:34 Constant:
0:34 0 (const uint)
0:34 gl_Position: direct index for structure (4-component vector of float)
0:34 direct index (in block)
0:34 'gl_in' (in unsized array of block)
0:34 Constant:
0:34 0 (const int)
0:34 Constant:
0:34 0 (const int)
0:35 move second child to first child (float)
0:35 gl_PointSize: direct index for structure (float)
0:35 '__anon__1' (out block)
0:35 Constant:
0:35 1 (const uint)
0:35 gl_PointSize: direct index for structure (float)
0:35 direct index (in block)
0:35 'gl_in' (in unsized array of block)
0:35 Constant:
0:35 3 (const int)
0:35 Constant:
0:35 1 (const int)
0:36 move second child to first child (int)
0:36 'gl_PrimitiveID' (out int)
0:36 'gl_PrimitiveIDIn' (in int)
0:37 move second child to first child (int)
0:37 'gl_Layer' (out int)
0:37 Constant:
0:37 2 (const int)
0:? Linker Objects 0:? Linker Objects
0:? 'fromV' (in block)
0:? 'toF' (out block)
0:? '__anon__0' (out block)
Test/baseResults/150.vert.out
Warning, version 150 is not yet complete; some version-specific features are present, but many are missing. Warning, version 150 is not yet complete; some version-specific features are present, but many are missing.
ERROR: 0:13: 'gl_ClipDistance' : undeclared identifier
ERROR: 0:13: 'gl_ClipDistance' : left of '[' is not of type array, matrix, or vector
ERROR: 0:13: 'assign' : l-value required (can't modify a const)
ERROR: 0:16: 'gl_' : reserved built-in name
ERROR: 0:21: 'a' : cannot redeclare a user-block member array ERROR: 0:21: 'a' : cannot redeclare a user-block member array
ERROR: 5 compilation errors. No code generated. ERROR: 1 compilation errors. No code generated.
ERROR: node is still EOpNull! ERROR: node is still EOpNull!
0:9 Function Definition: main( (void) 0:9 Function Definition: main( (void)
0:9 Function Parameters: 0:9 Function Parameters:
0:11 Sequence 0:11 Sequence
0:11 move second child to first child (4-component vector of float) 0:11 move second child to first child (4-component vector of float)
0:11 'gl_Position' (invariant gl_Position 4-component vector of float) 0:11 gl_Position: direct index for structure (invariant gl_Position 4-component vector of float)
0:11 '__anon__0' (out block)
0:11 Constant:
0:11 0 (const uint)
0:11 'iv4' (in 4-component vector of float) 0:11 'iv4' (in 4-component vector of float)
0:12 move second child to first child (float) 0:12 move second child to first child (float)
0:12 'gl_PointSize' (gl_PointSize float) 0:12 gl_PointSize: direct index for structure (gl_PointSize float)
0:12 '__anon__0' (out block)
0:12 Constant:
0:12 1 (const uint)
0:12 'ps' (uniform float) 0:12 'ps' (uniform float)
0:13 move second child to first child (float) 0:13 move second child to first child (float)
0:13 direct index (float)
0:13 gl_ClipDistance: direct index for structure (4-element array of float)
0:13 '__anon__0' (out block)
0:13 Constant:
0:13 2 (const uint)
0:13 Constant: 0:13 Constant:
0:13 0.000000 0:13 2 (const int)
0:13 direct index (float) 0:13 direct index (float)
0:13 'iv4' (in 4-component vector of float) 0:13 'iv4' (in 4-component vector of float)
0:13 Constant: 0:13 Constant:
...@@ -26,8 +33,7 @@ ERROR: node is still EOpNull! ...@@ -26,8 +33,7 @@ ERROR: node is still EOpNull!
0:? Linker Objects 0:? Linker Objects
0:? 'iv4' (in 4-component vector of float) 0:? 'iv4' (in 4-component vector of float)
0:? 'ps' (uniform float) 0:? 'ps' (uniform float)
0:? 'gl_ClipDistance' (4-element array of float) 0:? '__anon__1' (layout(shared ) uniform block)
0:? '__anon__0' (layout(shared ) uniform block)
0:? 'gl_VertexID' (gl_VertexId int) 0:? 'gl_VertexID' (gl_VertexId int)
0:? 'gl_InstanceID' (gl_InstanceId int) 0:? 'gl_InstanceID' (gl_InstanceId int)
Test/baseResults/400.frag.out
...@@ -13,8 +13,18 @@ ERROR: node is still EOpNull! ...@@ -13,8 +13,18 @@ ERROR: node is still EOpNull!
0:11 'arrayedSampler' (uniform 5-element array of sampler2D) 0:11 'arrayedSampler' (uniform 5-element array of sampler2D)
0:11 'i' (flat in int) 0:11 'i' (flat in int)
0:11 'c2D' (smooth in 2-component vector of float) 0:11 'c2D' (smooth in 2-component vector of float)
0:12 move second child to first child (float)
0:12 direct index (float)
0:12 'outp' (out 4-component vector of float)
0:12 Constant:
0:12 0 (const int)
0:12 direct index (smooth in float)
0:12 'gl_ClipDistance' (smooth in unsized array of float)
0:12 Constant:
0:12 1 (const int)
0:? Linker Objects 0:? Linker Objects
0:? 'c2D' (smooth in 2-component vector of float) 0:? 'c2D' (smooth in 2-component vector of float)
0:? 'i' (flat in int) 0:? 'i' (flat in int)
0:? 'outp' (out 4-component vector of float)
0:? 'arrayedSampler' (uniform 5-element array of sampler2D) 0:? 'arrayedSampler' (uniform 5-element array of sampler2D)
Test/baseResults/400.geom.out
...@@ -11,5 +11,9 @@ Warning, version 400 is not yet complete; some version-specific features are pre ...@@ -11,5 +11,9 @@ Warning, version 400 is not yet complete; some version-specific features are pre
0:6 0 (const int) 0:6 0 (const int)
0:7 EmitVertex (void) 0:7 EmitVertex (void)
0:8 EndPrimitive (void) 0:8 EndPrimitive (void)
0:10 Sequence
0:10 move second child to first child (int)
0:10 'id' (int)
0:10 'gl_InvocationID' (in int)
0:? Linker Objects 0:? Linker Objects
Test/baseResults/410.geom.out
Warning, version 410 is not yet complete; some version-specific features are present, but many are missing. Warning, version 410 is not yet complete; some version-specific features are present, but many are missing.
ERROR: 0:5: 'gl_ViewportIndex' : undeclared identifier 0:? Sequence
ERROR: 1 compilation errors. No code generated.
ERROR: node is still EOpNull!
0:3 Function Definition: main( (void) 0:3 Function Definition: main( (void)
0:3 Function Parameters: 0:3 Function Parameters:
0:5 Sequence 0:5 Sequence
0:5 move second child to first child (float) 0:5 move second child to first child (int)
0:5 'gl_ViewportIndex' (float) 0:5 'gl_ViewportIndex' (out int)
0:5 Constant: 0:5 Constant:
0:5 7.000000 0:5 7 (const int)
0:? Linker Objects 0:? Linker Objects
Test/baseResults/430scope.vert.out
...@@ -48,7 +48,10 @@ ERROR: node is still EOpNull! ...@@ -48,7 +48,10 @@ ERROR: node is still EOpNull!
0:40 Constant: 0:40 Constant:
0:40 3.000000 0:40 3.000000
0:42 move second child to first child (4-component vector of float) 0:42 move second child to first child (4-component vector of float)
0:42 'gl_Position' (invariant gl_Position 4-component vector of float) 0:42 gl_Position: direct index for structure (invariant gl_Position 4-component vector of float)
0:42 '__anon__0' (out block)
0:42 Constant:
0:42 0 (const uint)
0:42 Construct vec4 (4-component vector of float) 0:42 Construct vec4 (4-component vector of float)
0:42 'f' (float) 0:42 'f' (float)
0:44 Sequence 0:44 Sequence
......
Test/baseResults/specExamples.frag.out
...@@ -21,7 +21,6 @@ ERROR: 0:112: 'depth_any' : unrecognized layout identifier ...@@ -21,7 +21,6 @@ ERROR: 0:112: 'depth_any' : unrecognized layout identifier
ERROR: 0:115: 'depth_greater' : unrecognized layout identifier ERROR: 0:115: 'depth_greater' : unrecognized layout identifier
ERROR: 0:118: 'depth_less' : unrecognized layout identifier ERROR: 0:118: 'depth_less' : unrecognized layout identifier
ERROR: 0:121: 'depth_unchanged' : unrecognized layout identifier ERROR: 0:121: 'depth_unchanged' : unrecognized layout identifier
ERROR: 0:123: 'gl_' : reserved built-in name
ERROR: 0:150: 'constructor' : constructing from a non-dereferenced array ERROR: 0:150: 'constructor' : constructing from a non-dereferenced array
ERROR: 0:152: '=' : cannot convert from 'const 2-element array of 4-component vector of float' to '3-element array of 4-component vector of float' ERROR: 0:152: '=' : cannot convert from 'const 2-element array of 4-component vector of float' to '3-element array of 4-component vector of float'
ERROR: 0:172: 'x' : undeclared identifier ERROR: 0:172: 'x' : undeclared identifier
...@@ -52,7 +51,7 @@ ERROR: 0:226: 'in' : not allowed in nested scope ...@@ -52,7 +51,7 @@ ERROR: 0:226: 'in' : not allowed in nested scope
ERROR: 0:227: 'in' : not allowed in nested scope ERROR: 0:227: 'in' : not allowed in nested scope
ERROR: 0:228: 'in' : not allowed in nested scope ERROR: 0:228: 'in' : not allowed in nested scope
ERROR: 0:232: 'out' : not allowed in nested scope ERROR: 0:232: 'out' : not allowed in nested scope
ERROR: 53 compilation errors. No code generated. ERROR: 52 compilation errors. No code generated.
ERROR: node is still EOpNull! ERROR: node is still EOpNull!
0:5 Sequence 0:5 Sequence
...@@ -270,5 +269,5 @@ ERROR: node is still EOpNull! ...@@ -270,5 +269,5 @@ ERROR: node is still EOpNull!
0:? 'factor' (layout(location=3 ) out 4-component vector of float) 0:? 'factor' (layout(location=3 ) out 4-component vector of float)
0:? 'colors' (layout(location=2 ) out 3-element array of 4-component vector of float) 0:? 'colors' (layout(location=2 ) out 3-element array of 4-component vector of float)
0:? 'gl_FragDepth' (gl_FragDepth float) 0:? 'gl_FragDepth' (gl_FragDepth float)
0:? 'gl_Color' (smooth in 4-component vector of float) 0:? '__anon__2' (in block)
Test/baseResults/specExamples.vert.out
...@@ -32,7 +32,6 @@ ERROR: 0:95: 'binding' : not supported ...@@ -32,7 +32,6 @@ ERROR: 0:95: 'binding' : not supported
ERROR: 0:96: 'binding' : not supported ERROR: 0:96: 'binding' : not supported
ERROR: 0:97: 'binding' : not supported ERROR: 0:97: 'binding' : not supported
ERROR: 0:106: '' : vertex input cannot be further qualified ERROR: 0:106: '' : vertex input cannot be further qualified
ERROR: 0:106: 'gl_' : reserved built-in name
ERROR: 0:112: 'ColorIvn' : identifier not previously declared ERROR: 0:112: 'ColorIvn' : identifier not previously declared
ERROR: 0:119: 'a' : redefinition ERROR: 0:119: 'a' : redefinition
ERROR: 0:132: 'shared' : not supported in this stage: vertex ERROR: 0:132: 'shared' : not supported in this stage: vertex
...@@ -51,7 +50,7 @@ ERROR: 0:191: '=' : cannot convert from 'const 4-component vector of float' to ...@@ -51,7 +50,7 @@ ERROR: 0:191: '=' : cannot convert from 'const 4-component vector of float' to
ERROR: 0:192: 'constructor' : constructing from a non-dereferenced array ERROR: 0:192: 'constructor' : constructing from a non-dereferenced array
ERROR: 0:193: 'constructor' : constructing from a non-dereferenced array ERROR: 0:193: 'constructor' : constructing from a non-dereferenced array
ERROR: 0:194: 'constructor' : constructing from a non-dereferenced array ERROR: 0:194: 'constructor' : constructing from a non-dereferenced array
ERROR: 52 compilation errors. No code generated. ERROR: 51 compilation errors. No code generated.
ERROR: node is still EOpNull! ERROR: node is still EOpNull!
0:134 Function Definition: funcA(I21; (4-component vector of float) 0:134 Function Definition: funcA(I21; (4-component vector of float)
...@@ -257,7 +256,7 @@ ERROR: node is still EOpNull! ...@@ -257,7 +256,7 @@ ERROR: node is still EOpNull!
0:? 'b2' (uniform int) 0:? 'b2' (uniform int)
0:? 'c2' (uniform int) 0:? 'c2' (uniform int)
0:? 'd2' (uniform int) 0:? 'd2' (uniform int)
0:? 'gl_FrontColor' (flat in 4-component vector of float) 0:? '__anon__5' (out block)
0:? 'ColorInv' (smooth out 3-component vector of float) 0:? 'ColorInv' (smooth out 3-component vector of float)
0:? 'Color4' (invariant centroid smooth out 3-component vector of float) 0:? 'Color4' (invariant centroid smooth out 3-component vector of float)
0:? 'position' (smooth out 4-component vector of float) 0:? 'position' (smooth out 4-component vector of float)
...@@ -266,8 +265,8 @@ ERROR: node is still EOpNull! ...@@ -266,8 +265,8 @@ ERROR: node is still EOpNull!
0:? 'c' (in 4-component vector of float) 0:? 'c' (in 4-component vector of float)
0:? 'd' (in 4-component vector of float) 0:? 'd' (in 4-component vector of float)
0:? 'v' (smooth out 4-component vector of float) 0:? 'v' (smooth out 4-component vector of float)
0:? '__anon__5' (layout(shared ) uniform block)
0:? '__anon__6' (layout(shared ) uniform block) 0:? '__anon__6' (layout(shared ) uniform block)
0:? '__anon__7' (layout(shared ) uniform block)
0:? 'shv' (shared 4-component vector of float) 0:? 'shv' (shared 4-component vector of float)
0:? 'img1' (uniform image2D) 0:? 'img1' (uniform image2D)
0:? 'img2' (coherent uniform image2D) 0:? 'img2' (coherent uniform image2D)
......
Test/baseResults/test.conf
...@@ -17,6 +17,7 @@ MaxVertexOutputVectors 16 ...@@ -17,6 +17,7 @@ MaxVertexOutputVectors 16
MaxFragmentInputVectors 15 MaxFragmentInputVectors 15
MinProgramTexelOffset -8 MinProgramTexelOffset -8
MaxProgramTexelOffset 7 MaxProgramTexelOffset 7
MaxClipDistances 8
nonInductiveForLoops 1 nonInductiveForLoops 1
whileLoops 1 whileLoops 1
doWhileLoops 1 doWhileLoops 1
......
Test/baseResults/uint.frag.out
ERROR: 0:2: 'in' : must be qualified as 'flat' uint ERROR: 0:2: 'uint' : must be qualified as flat in
ERROR: 0:6: 'in' : cannot be bool ERROR: 0:6: 'in' : cannot be bool
ERROR: 0:20: 'const' : non-matching types for const initializer ERROR: 0:20: 'const' : non-matching types for const initializer
ERROR: 0:24: 'const' : non-matching types for const initializer ERROR: 0:24: 'const' : non-matching types for const initializer
......
Test/baseResults/versionsClean.vert.out
...@@ -4,7 +4,10 @@ Warning, version 420 is not yet complete; some version-specific features are pre ...@@ -4,7 +4,10 @@ Warning, version 420 is not yet complete; some version-specific features are pre
0:40 Function Parameters: 0:40 Function Parameters:
0:42 Sequence 0:42 Sequence
0:42 move second child to first child (4-component vector of float) 0:42 move second child to first child (4-component vector of float)
0:42 'gl_Position' (gl_Position 4-component vector of float) 0:42 gl_Position: direct index for structure (gl_Position 4-component vector of float)
0:42 '__anon__1' (out block)
0:42 Constant:
0:42 0 (const uint)
0:42 Construct vec4 (4-component vector of float) 0:42 Construct vec4 (4-component vector of float)
0:42 'color' (in 3-component vector of float) 0:42 'color' (in 3-component vector of float)
0:42 Constant: 0:42 Constant:
......
Test/baseResults/versionsErrors.vert.out
...@@ -9,7 +9,10 @@ ERROR: node is still EOpNull! ...@@ -9,7 +9,10 @@ ERROR: node is still EOpNull!
0:42 Function Parameters: 0:42 Function Parameters:
0:44 Sequence 0:44 Sequence
0:44 move second child to first child (4-component vector of float) 0:44 move second child to first child (4-component vector of float)
0:44 'gl_Position' (gl_Position 4-component vector of float) 0:44 gl_Position: direct index for structure (gl_Position 4-component vector of float)
0:44 '__anon__1' (out block)
0:44 Constant:
0:44 0 (const uint)
0:44 Construct vec4 (4-component vector of float) 0:44 Construct vec4 (4-component vector of float)
0:44 'color' (in 3-component vector of float) 0:44 'color' (in 3-component vector of float)
0:44 Constant: 0:44 Constant:
......
glslang/Include/ResourceLimits.h
...@@ -69,6 +69,7 @@ struct TBuiltInResource { ...@@ -69,6 +69,7 @@ struct TBuiltInResource {
int maxFragmentInputVectors; int maxFragmentInputVectors;
int minProgramTexelOffset; int minProgramTexelOffset;
int maxProgramTexelOffset; int maxProgramTexelOffset;
int maxClipDistances;
TLimits limits; TLimits limits;
}; };
......
glslang/MachineIndependent/Initialize.cpp
...@@ -51,9 +51,16 @@ ...@@ -51,9 +51,16 @@
namespace glslang { namespace glslang {
const int FirstProfileVersion = 150; // TODO: ARB_Compatability: do full extension support
bool ARBCompatibility = true;
const bool ForwardCompatibility = false; const bool ForwardCompatibility = false;
inline bool IncludeLegacy(int version, EProfile profile)
{
return profile != EEsProfile && (version <= 130 || ARBCompatibility || profile == ECompatibilityProfile);
}
TBuiltIns::TBuiltIns() TBuiltIns::TBuiltIns()
{ {
// Set up textual representations for making all the permutations // Set up textual representations for making all the permutations
...@@ -88,510 +95,526 @@ TBuiltIns::~TBuiltIns() ...@@ -88,510 +95,526 @@ TBuiltIns::~TBuiltIns()
// //
void TBuiltIns::initialize(int version, EProfile profile) void TBuiltIns::initialize(int version, EProfile profile)
{ {
{
//============================================================================ //============================================================================
// //
// Prototypes for built-in functions seen by both vertex and fragment shaders. // Prototypes for built-in functions seen by both vertex and fragment shaders.
// //
//============================================================================ //============================================================================
TString& s = commonBuiltins;
// //
// Angle and Trigonometric Functions. // Angle and Trigonometric Functions.
// //
s.append("float radians(float degrees);"); commonBuiltins.append(
s.append("vec2 radians(vec2 degrees);"); "float radians(float degrees);"
s.append("vec3 radians(vec3 degrees);"); "vec2 radians(vec2 degrees);"
s.append("vec4 radians(vec4 degrees);"); "vec3 radians(vec3 degrees);"
"vec4 radians(vec4 degrees);"
s.append("float degrees(float radians);");
s.append("vec2 degrees(vec2 radians);"); "float degrees(float radians);"
s.append("vec3 degrees(vec3 radians);"); "vec2 degrees(vec2 radians);"
s.append("vec4 degrees(vec4 radians);"); "vec3 degrees(vec3 radians);"
"vec4 degrees(vec4 radians);"
s.append("float sin(float angle);");
s.append("vec2 sin(vec2 angle);"); "float sin(float angle);"
s.append("vec3 sin(vec3 angle);"); "vec2 sin(vec2 angle);"
s.append("vec4 sin(vec4 angle);"); "vec3 sin(vec3 angle);"
"vec4 sin(vec4 angle);"
s.append("float cos(float angle);");
s.append("vec2 cos(vec2 angle);"); "float cos(float angle);"
s.append("vec3 cos(vec3 angle);"); "vec2 cos(vec2 angle);"
s.append("vec4 cos(vec4 angle);"); "vec3 cos(vec3 angle);"
"vec4 cos(vec4 angle);"
s.append("float tan(float angle);");
s.append("vec2 tan(vec2 angle);"); "float tan(float angle);"
s.append("vec3 tan(vec3 angle);"); "vec2 tan(vec2 angle);"
s.append("vec4 tan(vec4 angle);"); "vec3 tan(vec3 angle);"
"vec4 tan(vec4 angle);"
s.append("float asin(float x);");
s.append("vec2 asin(vec2 x);"); "float asin(float x);"
s.append("vec3 asin(vec3 x);"); "vec2 asin(vec2 x);"
s.append("vec4 asin(vec4 x);"); "vec3 asin(vec3 x);"
"vec4 asin(vec4 x);"
s.append("float acos(float x);");
s.append("vec2 acos(vec2 x);"); "float acos(float x);"
s.append("vec3 acos(vec3 x);"); "vec2 acos(vec2 x);"
s.append("vec4 acos(vec4 x);"); "vec3 acos(vec3 x);"
"vec4 acos(vec4 x);"
s.append("float atan(float y, float x);");
s.append("vec2 atan(vec2 y, vec2 x);"); "float atan(float y, float x);"
s.append("vec3 atan(vec3 y, vec3 x);"); "vec2 atan(vec2 y, vec2 x);"
s.append("vec4 atan(vec4 y, vec4 x);"); "vec3 atan(vec3 y, vec3 x);"
"vec4 atan(vec4 y, vec4 x);"
s.append("float atan(float y_over_x);");
s.append("vec2 atan(vec2 y_over_x);"); "float atan(float y_over_x);"
s.append("vec3 atan(vec3 y_over_x);"); "vec2 atan(vec2 y_over_x);"
s.append("vec4 atan(vec4 y_over_x);"); "vec3 atan(vec3 y_over_x);"
"vec4 atan(vec4 y_over_x);"
s.append("float sinh(float angle);");
s.append("vec2 sinh(vec2 angle);"); "\n");
s.append("vec3 sinh(vec3 angle);");
s.append("vec4 sinh(vec4 angle);");
s.append("float cosh(float angle);");
s.append("vec2 cosh(vec2 angle);");
s.append("vec3 cosh(vec3 angle);");
s.append("vec4 cosh(vec4 angle);");
s.append("float tanh(float angle);");
s.append("vec2 tanh(vec2 angle);");
s.append("vec3 tanh(vec3 angle);");
s.append("vec4 tanh(vec4 angle);");
s.append("float asinh(float x);");
s.append("vec2 asinh(vec2 x);");
s.append("vec3 asinh(vec3 x);");
s.append("vec4 asinh(vec4 x);");
s.append("float acosh(float x);");
s.append("vec2 acosh(vec2 x);");
s.append("vec3 acosh(vec3 x);");
s.append("vec4 acosh(vec4 x);");
s.append("float atanh(float y_over_x);");
s.append("vec2 atanh(vec2 y_over_x);");
s.append("vec3 atanh(vec3 y_over_x);");
s.append("vec4 atanh(vec4 y_over_x);");
// if (version >= 130) {
// Exponential Functions. commonBuiltins.append(
// "float sinh(float angle);"
s.append("float pow(float x, float y);"); "vec2 sinh(vec2 angle);"
s.append("vec2 pow(vec2 x, vec2 y);"); "vec3 sinh(vec3 angle);"
s.append("vec3 pow(vec3 x, vec3 y);"); "vec4 sinh(vec4 angle);"
s.append("vec4 pow(vec4 x, vec4 y);");
s.append("float exp(float x);"); "float cosh(float angle);"
s.append("vec2 exp(vec2 x);"); "vec2 cosh(vec2 angle);"
s.append("vec3 exp(vec3 x);"); "vec3 cosh(vec3 angle);"
s.append("vec4 exp(vec4 x);"); "vec4 cosh(vec4 angle);"
s.append("float log(float x);"); "float tanh(float angle);"
s.append("vec2 log(vec2 x);"); "vec2 tanh(vec2 angle);"
s.append("vec3 log(vec3 x);"); "vec3 tanh(vec3 angle);"
s.append("vec4 log(vec4 x);"); "vec4 tanh(vec4 angle);"
s.append("float exp2(float x);"); "float asinh(float x);"
s.append("vec2 exp2(vec2 x);"); "vec2 asinh(vec2 x);"
s.append("vec3 exp2(vec3 x);"); "vec3 asinh(vec3 x);"
s.append("vec4 exp2(vec4 x);"); "vec4 asinh(vec4 x);"
s.append("float log2(float x);"); "float acosh(float x);"
s.append("vec2 log2(vec2 x);"); "vec2 acosh(vec2 x);"
s.append("vec3 log2(vec3 x);"); "vec3 acosh(vec3 x);"
s.append("vec4 log2(vec4 x);"); "vec4 acosh(vec4 x);"
s.append("float sqrt(float x);"); "float atanh(float y_over_x);"
s.append("vec2 sqrt(vec2 x);"); "vec2 atanh(vec2 y_over_x);"
s.append("vec3 sqrt(vec3 x);"); "vec3 atanh(vec3 y_over_x);"
s.append("vec4 sqrt(vec4 x);"); "vec4 atanh(vec4 y_over_x);"
s.append("float inversesqrt(float x);"); "\n");
s.append("vec2 inversesqrt(vec2 x);"); }
s.append("vec3 inversesqrt(vec3 x);");
s.append("vec4 inversesqrt(vec4 x);");
// //
// Common Functions. // Exponential Functions.
// //
s.append("float abs(float x);"); commonBuiltins.append(
s.append("vec2 abs(vec2 x);"); "float pow(float x, float y);"
s.append("vec3 abs(vec3 x);"); "vec2 pow(vec2 x, vec2 y);"
s.append("vec4 abs(vec4 x);"); "vec3 pow(vec3 x, vec3 y);"
"vec4 pow(vec4 x, vec4 y);"
if (version >= 130) { "float exp(float x);"
s.append(" int abs( int x);"); "vec2 exp(vec2 x);"
s.append("ivec2 abs(ivec2 x);"); "vec3 exp(vec3 x);"
s.append("ivec3 abs(ivec3 x);"); "vec4 exp(vec4 x);"
s.append("ivec4 abs(ivec4 x);");
}
"float log(float x);"
"vec2 log(vec2 x);"
"vec3 log(vec3 x);"
"vec4 log(vec4 x);"
s.append("float sign(float x);"); "float exp2(float x);"
s.append("vec2 sign(vec2 x);"); "vec2 exp2(vec2 x);"
s.append("vec3 sign(vec3 x);"); "vec3 exp2(vec3 x);"
s.append("vec4 sign(vec4 x);"); "vec4 exp2(vec4 x);"
if (version >= 130) { "float log2(float x);"
s.append(" int sign( int x);"); "vec2 log2(vec2 x);"
s.append("ivec2 sign(ivec2 x);"); "vec3 log2(vec3 x);"
s.append("ivec3 sign(ivec3 x);"); "vec4 log2(vec4 x);"
s.append("ivec4 sign(ivec4 x);");
}
s.append("float floor(float x);"); "float sqrt(float x);"
s.append("vec2 floor(vec2 x);"); "vec2 sqrt(vec2 x);"
s.append("vec3 floor(vec3 x);"); "vec3 sqrt(vec3 x);"
s.append("vec4 floor(vec4 x);"); "vec4 sqrt(vec4 x);"
if (version >= 130) { "float inversesqrt(float x);"
s.append("float trunc(float x);"); "vec2 inversesqrt(vec2 x);"
s.append("vec2 trunc(vec2 x);"); "vec3 inversesqrt(vec3 x);"
s.append("vec3 trunc(vec3 x);"); "vec4 inversesqrt(vec4 x);"
s.append("vec4 trunc(vec4 x);");
s.append("float round(float x);");
s.append("vec2 round(vec2 x);");
s.append("vec3 round(vec3 x);");
s.append("vec4 round(vec4 x);");
s.append("float roundEven(float x);");
s.append("vec2 roundEven(vec2 x);");
s.append("vec3 roundEven(vec3 x);");
s.append("vec4 roundEven(vec4 x);");
}
s.append("float ceil(float x);");
s.append("vec2 ceil(vec2 x);");
s.append("vec3 ceil(vec3 x);");
s.append("vec4 ceil(vec4 x);");
s.append("float fract(float x);");
s.append("vec2 fract(vec2 x);");
s.append("vec3 fract(vec3 x);");
s.append("vec4 fract(vec4 x);");
s.append("float mod(float x, float y);");
s.append("vec2 mod(vec2 x, float y);");
s.append("vec3 mod(vec3 x, float y);");
s.append("vec4 mod(vec4 x, float y);");
s.append("vec2 mod(vec2 x, vec2 y);");
s.append("vec3 mod(vec3 x, vec3 y);");
s.append("vec4 mod(vec4 x, vec4 y);");
if (version >= 130) { "\n");
s.append("float modf(float, out float);");
s.append("vec2 modf(vec2, out vec2 );");
s.append("vec3 modf(vec3, out vec3 );");
s.append("vec4 modf(vec4, out vec4 );");
}
s.append("float min(float x, float y);");
s.append("vec2 min(vec2 x, float y);");
s.append("vec3 min(vec3 x, float y);");
s.append("vec4 min(vec4 x, float y);");
s.append("vec2 min(vec2 x, vec2 y);");
s.append("vec3 min(vec3 x, vec3 y);");
s.append("vec4 min(vec4 x, vec4 y);");
if (version >= 130) {
s.append(" int min(int x, int y);");
s.append("ivec2 min(ivec2 x, int y);");
s.append("ivec3 min(ivec3 x, int y);");
s.append("ivec4 min(ivec4 x, int y);");
s.append("ivec2 min(ivec2 x, ivec2 y);");
s.append("ivec3 min(ivec3 x, ivec3 y);");
s.append("ivec4 min(ivec4 x, ivec4 y);");
s.append(" uint min(uint x, uint y);");
s.append("uvec2 min(uvec2 x, uint y);");
s.append("uvec3 min(uvec3 x, uint y);");
s.append("uvec4 min(uvec4 x, uint y);");
s.append("uvec2 min(uvec2 x, uvec2 y);");
s.append("uvec3 min(uvec3 x, uvec3 y);");
s.append("uvec4 min(uvec4 x, uvec4 y);");
}
s.append("float max(float x, float y);");
s.append("vec2 max(vec2 x, float y);");
s.append("vec3 max(vec3 x, float y);");
s.append("vec4 max(vec4 x, float y);");
s.append("vec2 max(vec2 x, vec2 y);");
s.append("vec3 max(vec3 x, vec3 y);");
s.append("vec4 max(vec4 x, vec4 y);");
if (version >= 130) {
s.append(" int max(int x, int y);");
s.append("ivec2 max(ivec2 x, int y);");
s.append("ivec3 max(ivec3 x, int y);");
s.append("ivec4 max(ivec4 x, int y);");
s.append("ivec2 max(ivec2 x, ivec2 y);");
s.append("ivec3 max(ivec3 x, ivec3 y);");
s.append("ivec4 max(ivec4 x, ivec4 y);");
s.append(" uint max(uint x, uint y);");
s.append("uvec2 max(uvec2 x, uint y);");
s.append("uvec3 max(uvec3 x, uint y);");
s.append("uvec4 max(uvec4 x, uint y);");
s.append("uvec2 max(uvec2 x, uvec2 y);");
s.append("uvec3 max(uvec3 x, uvec3 y);");
s.append("uvec4 max(uvec4 x, uvec4 y);");
}
s.append("float clamp(float x, float minVal, float maxVal);");
s.append("vec2 clamp(vec2 x, float minVal, float maxVal);");
s.append("vec3 clamp(vec3 x, float minVal, float maxVal);");
s.append("vec4 clamp(vec4 x, float minVal, float maxVal);");
s.append("vec2 clamp(vec2 x, vec2 minVal, vec2 maxVal);");
s.append("vec3 clamp(vec3 x, vec3 minVal, vec3 maxVal);");
s.append("vec4 clamp(vec4 x, vec4 minVal, vec4 maxVal);");
if (version >= 130) {
s.append("int clamp(int x, int minVal, int maxVal);");
s.append("ivec2 clamp(ivec2 x, int minVal, int maxVal);");
s.append("ivec3 clamp(ivec3 x, int minVal, int maxVal);");
s.append("ivec4 clamp(ivec4 x, int minVal, int maxVal);");
s.append("ivec2 clamp(ivec2 x, ivec2 minVal, ivec2 maxVal);");
s.append("ivec3 clamp(ivec3 x, ivec3 minVal, ivec3 maxVal);");
s.append("ivec4 clamp(ivec4 x, ivec4 minVal, ivec4 maxVal);");
s.append("uint clamp(uint x, uint minVal, uint maxVal);");
s.append("uvec2 clamp(uvec2 x, uint minVal, uint maxVal);");
s.append("uvec3 clamp(uvec3 x, uint minVal, uint maxVal);");
s.append("uvec4 clamp(uvec4 x, uint minVal, uint maxVal);");
s.append("uvec2 clamp(uvec2 x, uvec2 minVal, uvec2 maxVal);");
s.append("uvec3 clamp(uvec3 x, uvec3 minVal, uvec3 maxVal);");
s.append("uvec4 clamp(uvec4 x, uvec4 minVal, uvec4 maxVal);");
}
s.append("float mix(float x, float y, float a);");
s.append("vec2 mix(vec2 x, vec2 y, float a);");
s.append("vec3 mix(vec3 x, vec3 y, float a);");
s.append("vec4 mix(vec4 x, vec4 y, float a);");
s.append("vec2 mix(vec2 x, vec2 y, vec2 a);");
s.append("vec3 mix(vec3 x, vec3 y, vec3 a);");
s.append("vec4 mix(vec4 x, vec4 y, vec4 a);");
if (version >= 130) { //
s.append("float mix(float x, float y, bool a);"); // Common Functions.
s.append("vec2 mix(vec2 x, vec2 y, bvec2 a);"); //
s.append("vec3 mix(vec3 x, vec3 y, bvec3 a);"); commonBuiltins.append(
s.append("vec4 mix(vec4 x, vec4 y, bvec4 a);"); "float abs(float x);"
} "vec2 abs(vec2 x);"
"vec3 abs(vec3 x);"
s.append("float step(float edge, float x);"); "vec4 abs(vec4 x);"
s.append("vec2 step(vec2 edge, vec2 x);");
s.append("vec3 step(vec3 edge, vec3 x);"); "float sign(float x);"
s.append("vec4 step(vec4 edge, vec4 x);"); "vec2 sign(vec2 x);"
s.append("vec2 step(float edge, vec2 x);"); "vec3 sign(vec3 x);"
s.append("vec3 step(float edge, vec3 x);"); "vec4 sign(vec4 x);"
s.append("vec4 step(float edge, vec4 x);");
"float floor(float x);"
s.append("float smoothstep(float edge0, float edge1, float x);"); "vec2 floor(vec2 x);"
s.append("vec2 smoothstep(vec2 edge0, vec2 edge1, vec2 x);"); "vec3 floor(vec3 x);"
s.append("vec3 smoothstep(vec3 edge0, vec3 edge1, vec3 x);"); "vec4 floor(vec4 x);"
s.append("vec4 smoothstep(vec4 edge0, vec4 edge1, vec4 x);");
s.append("vec2 smoothstep(float edge0, float edge1, vec2 x);"); "float ceil(float x);"
s.append("vec3 smoothstep(float edge0, float edge1, vec3 x);"); "vec2 ceil(vec2 x);"
s.append("vec4 smoothstep(float edge0, float edge1, vec4 x);"); "vec3 ceil(vec3 x);"
"vec4 ceil(vec4 x);"
"float fract(float x);"
"vec2 fract(vec2 x);"
"vec3 fract(vec3 x);"
"vec4 fract(vec4 x);"
"float mod(float x, float y);"
"vec2 mod(vec2 x, float y);"
"vec3 mod(vec3 x, float y);"
"vec4 mod(vec4 x, float y);"
"vec2 mod(vec2 x, vec2 y);"
"vec3 mod(vec3 x, vec3 y);"
"vec4 mod(vec4 x, vec4 y);"
"float min(float x, float y);"
"vec2 min(vec2 x, float y);"
"vec3 min(vec3 x, float y);"
"vec4 min(vec4 x, float y);"
"vec2 min(vec2 x, vec2 y);"
"vec3 min(vec3 x, vec3 y);"
"vec4 min(vec4 x, vec4 y);"
"float max(float x, float y);"
"vec2 max(vec2 x, float y);"
"vec3 max(vec3 x, float y);"
"vec4 max(vec4 x, float y);"
"vec2 max(vec2 x, vec2 y);"
"vec3 max(vec3 x, vec3 y);"
"vec4 max(vec4 x, vec4 y);"
"float clamp(float x, float minVal, float maxVal);"
"vec2 clamp(vec2 x, float minVal, float maxVal);"
"vec3 clamp(vec3 x, float minVal, float maxVal);"
"vec4 clamp(vec4 x, float minVal, float maxVal);"
"vec2 clamp(vec2 x, vec2 minVal, vec2 maxVal);"
"vec3 clamp(vec3 x, vec3 minVal, vec3 maxVal);"
"vec4 clamp(vec4 x, vec4 minVal, vec4 maxVal);"
"float mix(float x, float y, float a);"
"vec2 mix(vec2 x, vec2 y, float a);"
"vec3 mix(vec3 x, vec3 y, float a);"
"vec4 mix(vec4 x, vec4 y, float a);"
"vec2 mix(vec2 x, vec2 y, vec2 a);"
"vec3 mix(vec3 x, vec3 y, vec3 a);"
"vec4 mix(vec4 x, vec4 y, vec4 a);"
"float step(float edge, float x);"
"vec2 step(vec2 edge, vec2 x);"
"vec3 step(vec3 edge, vec3 x);"
"vec4 step(vec4 edge, vec4 x);"
"vec2 step(float edge, vec2 x);"
"vec3 step(float edge, vec3 x);"
"vec4 step(float edge, vec4 x);"
"float smoothstep(float edge0, float edge1, float x);"
"vec2 smoothstep(vec2 edge0, vec2 edge1, vec2 x);"
"vec3 smoothstep(vec3 edge0, vec3 edge1, vec3 x);"
"vec4 smoothstep(vec4 edge0, vec4 edge1, vec4 x);"
"vec2 smoothstep(float edge0, float edge1, vec2 x);"
"vec3 smoothstep(float edge0, float edge1, vec3 x);"
"vec4 smoothstep(float edge0, float edge1, vec4 x);"
"\n");
if (version >= 130) { if (version >= 130) {
s.append("bool isnan(float x);"); commonBuiltins.append(
s.append("bvec2 isnan(vec2 x);"); " int abs( int x);"
s.append("bvec3 isnan(vec3 x);"); "ivec2 abs(ivec2 x);"
s.append("bvec4 isnan(vec4 x);"); "ivec3 abs(ivec3 x);"
"ivec4 abs(ivec4 x);"
s.append("bool isinf(float x);");
s.append("bvec2 isinf(vec2 x);"); " int sign( int x);"
s.append("bvec3 isinf(vec3 x);"); "ivec2 sign(ivec2 x);"
s.append("bvec4 isinf(vec4 x);"); "ivec3 sign(ivec3 x);"
"ivec4 sign(ivec4 x);"
"float trunc(float x);"
"vec2 trunc(vec2 x);"
"vec3 trunc(vec3 x);"
"vec4 trunc(vec4 x);"
"float round(float x);"
"vec2 round(vec2 x);"
"vec3 round(vec3 x);"
"vec4 round(vec4 x);"
"float roundEven(float x);"
"vec2 roundEven(vec2 x);"
"vec3 roundEven(vec3 x);"
"vec4 roundEven(vec4 x);"
"float modf(float, out float);"
"vec2 modf(vec2, out vec2 );"
"vec3 modf(vec3, out vec3 );"
"vec4 modf(vec4, out vec4 );"
" int min(int x, int y);"
"ivec2 min(ivec2 x, int y);"
"ivec3 min(ivec3 x, int y);"
"ivec4 min(ivec4 x, int y);"
"ivec2 min(ivec2 x, ivec2 y);"
"ivec3 min(ivec3 x, ivec3 y);"
"ivec4 min(ivec4 x, ivec4 y);"
" uint min(uint x, uint y);"
"uvec2 min(uvec2 x, uint y);"
"uvec3 min(uvec3 x, uint y);"
"uvec4 min(uvec4 x, uint y);"
"uvec2 min(uvec2 x, uvec2 y);"
"uvec3 min(uvec3 x, uvec3 y);"
"uvec4 min(uvec4 x, uvec4 y);"
" int max(int x, int y);"
"ivec2 max(ivec2 x, int y);"
"ivec3 max(ivec3 x, int y);"
"ivec4 max(ivec4 x, int y);"
"ivec2 max(ivec2 x, ivec2 y);"
"ivec3 max(ivec3 x, ivec3 y);"
"ivec4 max(ivec4 x, ivec4 y);"
" uint max(uint x, uint y);"
"uvec2 max(uvec2 x, uint y);"
"uvec3 max(uvec3 x, uint y);"
"uvec4 max(uvec4 x, uint y);"
"uvec2 max(uvec2 x, uvec2 y);"
"uvec3 max(uvec3 x, uvec3 y);"
"uvec4 max(uvec4 x, uvec4 y);"
"int clamp(int x, int minVal, int maxVal);"
"ivec2 clamp(ivec2 x, int minVal, int maxVal);"
"ivec3 clamp(ivec3 x, int minVal, int maxVal);"
"ivec4 clamp(ivec4 x, int minVal, int maxVal);"
"ivec2 clamp(ivec2 x, ivec2 minVal, ivec2 maxVal);"
"ivec3 clamp(ivec3 x, ivec3 minVal, ivec3 maxVal);"
"ivec4 clamp(ivec4 x, ivec4 minVal, ivec4 maxVal);"
"uint clamp(uint x, uint minVal, uint maxVal);"
"uvec2 clamp(uvec2 x, uint minVal, uint maxVal);"
"uvec3 clamp(uvec3 x, uint minVal, uint maxVal);"
"uvec4 clamp(uvec4 x, uint minVal, uint maxVal);"
"uvec2 clamp(uvec2 x, uvec2 minVal, uvec2 maxVal);"
"uvec3 clamp(uvec3 x, uvec3 minVal, uvec3 maxVal);"
"uvec4 clamp(uvec4 x, uvec4 minVal, uvec4 maxVal);"
"float mix(float x, float y, bool a);"
"vec2 mix(vec2 x, vec2 y, bvec2 a);"
"vec3 mix(vec3 x, vec3 y, bvec3 a);"
"vec4 mix(vec4 x, vec4 y, bvec4 a);"
"bool isnan(float x);"
"bvec2 isnan(vec2 x);"
"bvec3 isnan(vec3 x);"
"bvec4 isnan(vec4 x);"
"bool isinf(float x);"
"bvec2 isinf(vec2 x);"
"bvec3 isinf(vec3 x);"
"bvec4 isinf(vec4 x);"
"\n");
} }
if ((profile == EEsProfile && version >= 300) || if ((profile == EEsProfile && version >= 300) ||
(profile != EEsProfile && version >= 330)) { (profile != EEsProfile && version >= 330)) {
s.append("int floatBitsToInt(float value);"); commonBuiltins.append(
s.append("ivec2 floatBitsToInt(vec2 value);"); "int floatBitsToInt(float value);"
s.append("ivec3 floatBitsToInt(vec3 value);"); "ivec2 floatBitsToInt(vec2 value);"
s.append("ivec4 floatBitsToInt(vec4 value);"); "ivec3 floatBitsToInt(vec3 value);"
"ivec4 floatBitsToInt(vec4 value);"
s.append("uint floatBitsToUint(float value);"); "uint floatBitsToUint(float value);"
s.append("uvec2 floatBitsToUint(vec2 value);"); "uvec2 floatBitsToUint(vec2 value);"
s.append("uvec3 floatBitsToUint(vec3 value);"); "uvec3 floatBitsToUint(vec3 value);"
s.append("uvec4 floatBitsToUint(vec4 value);"); "uvec4 floatBitsToUint(vec4 value);"
s.append("float intBitsToFloat(int value);"); "float intBitsToFloat(int value);"
s.append("vec2 intBitsToFloat(ivec2 value);"); "vec2 intBitsToFloat(ivec2 value);"
s.append("vec3 intBitsToFloat(ivec3 value);"); "vec3 intBitsToFloat(ivec3 value);"
s.append("vec4 intBitsToFloat(ivec4 value);"); "vec4 intBitsToFloat(ivec4 value);"
s.append("float uintBitsToFloat(uint value);"); "float uintBitsToFloat(uint value);"
s.append("vec2 uintBitsToFloat(uvec2 value);"); "vec2 uintBitsToFloat(uvec2 value);"
s.append("vec3 uintBitsToFloat(uvec3 value);"); "vec3 uintBitsToFloat(uvec3 value);"
s.append("vec4 uintBitsToFloat(uvec4 value);"); "vec4 uintBitsToFloat(uvec4 value);"
"\n");
} }
if ((profile == EEsProfile && version >= 300) || if ((profile == EEsProfile && version >= 300) ||
(profile != EEsProfile && version >= 400)) { (profile != EEsProfile && version >= 400)) {
s.append( "highp uint packSnorm2x16 (vec2);"); commonBuiltins.append(
s.append( "highp vec2 unpackSnorm2x16 (highp uint);"); "highp uint packSnorm2x16 (vec2);"
s.append( "highp uint packUnorm2x16 (vec2);"); "highp vec2 unpackSnorm2x16 (highp uint);"
s.append( "highp vec2 unpackUnorm2x16 (highp uint);"); "highp uint packUnorm2x16 (vec2);"
s.append( "highp uint packHalf2x16(mediump vec2);"); "highp vec2 unpackUnorm2x16 (highp uint);"
s.append("mediump vec2 unpackHalf2x16(highp uint);"); "highp uint packHalf2x16(mediump vec2);"
"mediump vec2 unpackHalf2x16(highp uint);"
"\n");
} }
// //
// Geometric Functions. // Geometric Functions.
// //
s.append("float length(float x);"); commonBuiltins.append(
s.append("float length(vec2 x);"); "float length(float x);"
s.append("float length(vec3 x);"); "float length(vec2 x);"
s.append("float length(vec4 x);"); "float length(vec3 x);"
"float length(vec4 x);"
s.append("float distance(float p0, float p1);"); "float distance(float p0, float p1);"
s.append("float distance(vec2 p0, vec2 p1);"); "float distance(vec2 p0, vec2 p1);"
s.append("float distance(vec3 p0, vec3 p1);"); "float distance(vec3 p0, vec3 p1);"
s.append("float distance(vec4 p0, vec4 p1);"); "float distance(vec4 p0, vec4 p1);"
s.append("float dot(float x, float y);"); "float dot(float x, float y);"
s.append("float dot(vec2 x, vec2 y);"); "float dot(vec2 x, vec2 y);"
s.append("float dot(vec3 x, vec3 y);"); "float dot(vec3 x, vec3 y);"
s.append("float dot(vec4 x, vec4 y);"); "float dot(vec4 x, vec4 y);"
s.append("vec3 cross(vec3 x, vec3 y);"); "vec3 cross(vec3 x, vec3 y);"
s.append("float normalize(float x);"); "float normalize(float x);"
s.append("vec2 normalize(vec2 x);"); "vec2 normalize(vec2 x);"
s.append("vec3 normalize(vec3 x);"); "vec3 normalize(vec3 x);"
s.append("vec4 normalize(vec4 x);"); "vec4 normalize(vec4 x);"
s.append("float faceforward(float N, float I, float Nref);"); "float faceforward(float N, float I, float Nref);"
s.append("vec2 faceforward(vec2 N, vec2 I, vec2 Nref);"); "vec2 faceforward(vec2 N, vec2 I, vec2 Nref);"
s.append("vec3 faceforward(vec3 N, vec3 I, vec3 Nref);"); "vec3 faceforward(vec3 N, vec3 I, vec3 Nref);"
s.append("vec4 faceforward(vec4 N, vec4 I, vec4 Nref);"); "vec4 faceforward(vec4 N, vec4 I, vec4 Nref);"
s.append("float reflect(float I, float N);"); "float reflect(float I, float N);"
s.append("vec2 reflect(vec2 I, vec2 N);"); "vec2 reflect(vec2 I, vec2 N);"
s.append("vec3 reflect(vec3 I, vec3 N);"); "vec3 reflect(vec3 I, vec3 N);"
s.append("vec4 reflect(vec4 I, vec4 N);"); "vec4 reflect(vec4 I, vec4 N);"
s.append("float refract(float I, float N, float eta);"); "float refract(float I, float N, float eta);"
s.append("vec2 refract(vec2 I, vec2 N, float eta);"); "vec2 refract(vec2 I, vec2 N, float eta);"
s.append("vec3 refract(vec3 I, vec3 N, float eta);"); "vec3 refract(vec3 I, vec3 N, float eta);"
s.append("vec4 refract(vec4 I, vec4 N, float eta);"); "vec4 refract(vec4 I, vec4 N, float eta);"
"\n");
// //
// Matrix Functions. // Matrix Functions.
// //
s.append("mat2 matrixCompMult(mat2 x, mat2 y);"); commonBuiltins.append(
s.append("mat3 matrixCompMult(mat3 x, mat3 y);"); "mat2 matrixCompMult(mat2 x, mat2 y);"
s.append("mat4 matrixCompMult(mat4 x, mat4 y);"); "mat3 matrixCompMult(mat3 x, mat3 y);"
"mat4 matrixCompMult(mat4 x, mat4 y);"
"\n");
if (version >= 120) { if (version >= 120) {
s.append("mat2 outerProduct(vec2 c, vec2 r);"); commonBuiltins.append(
s.append("mat3 outerProduct(vec3 c, vec3 r);"); "mat2 outerProduct(vec2 c, vec2 r);"
s.append("mat4 outerProduct(vec4 c, vec4 r);"); "mat3 outerProduct(vec3 c, vec3 r);"
s.append("mat2x3 outerProduct(vec3 c, vec2 r);"); "mat4 outerProduct(vec4 c, vec4 r);"
s.append("mat3x2 outerProduct(vec2 c, vec3 r);"); "mat2x3 outerProduct(vec3 c, vec2 r);"
s.append("mat2x4 outerProduct(vec4 c, vec2 r);"); "mat3x2 outerProduct(vec2 c, vec3 r);"
s.append("mat4x2 outerProduct(vec2 c, vec4 r);"); "mat2x4 outerProduct(vec4 c, vec2 r);"
s.append("mat3x4 outerProduct(vec4 c, vec3 r);"); "mat4x2 outerProduct(vec2 c, vec4 r);"
s.append("mat4x3 outerProduct(vec3 c, vec4 r);"); "mat3x4 outerProduct(vec4 c, vec3 r);"
"mat4x3 outerProduct(vec3 c, vec4 r);"
s.append("mat2 transpose(mat2 m);");
s.append("mat3 transpose(mat3 m);"); "mat2 transpose(mat2 m);"
s.append("mat4 transpose(mat4 m);"); "mat3 transpose(mat3 m);"
s.append("mat2x3 transpose(mat3x2 m);"); "mat4 transpose(mat4 m);"
s.append("mat3x2 transpose(mat2x3 m);"); "mat2x3 transpose(mat3x2 m);"
s.append("mat2x4 transpose(mat4x2 m);"); "mat3x2 transpose(mat2x3 m);"
s.append("mat4x2 transpose(mat2x4 m);"); "mat2x4 transpose(mat4x2 m);"
s.append("mat3x4 transpose(mat4x3 m);"); "mat4x2 transpose(mat2x4 m);"
s.append("mat4x3 transpose(mat3x4 m);"); "mat3x4 transpose(mat4x3 m);"
"mat4x3 transpose(mat3x4 m);"
"\n");
if (version >= 150) { if (version >= 150) {
s.append("float determinant(mat2 m);"); commonBuiltins.append(
s.append("float determinant(mat3 m);"); "float determinant(mat2 m);"
s.append("float determinant(mat4 m);"); "float determinant(mat3 m);"
"float determinant(mat4 m);"
s.append("mat2 inverse(mat2 m);"); "mat2 inverse(mat2 m);"
s.append("mat3 inverse(mat3 m);"); "mat3 inverse(mat3 m);"
s.append("mat4 inverse(mat4 m);"); "mat4 inverse(mat4 m);"
"\n");
} }
} }
// //
// Vector relational functions. // Vector relational functions.
// //
s.append("bvec2 lessThan(vec2 x, vec2 y);"); commonBuiltins.append(
s.append("bvec3 lessThan(vec3 x, vec3 y);"); "bvec2 lessThan(vec2 x, vec2 y);"
s.append("bvec4 lessThan(vec4 x, vec4 y);"); "bvec3 lessThan(vec3 x, vec3 y);"
"bvec4 lessThan(vec4 x, vec4 y);"
s.append("bvec2 lessThan(ivec2 x, ivec2 y);"); "bvec2 lessThan(ivec2 x, ivec2 y);"
s.append("bvec3 lessThan(ivec3 x, ivec3 y);"); "bvec3 lessThan(ivec3 x, ivec3 y);"
s.append("bvec4 lessThan(ivec4 x, ivec4 y);"); "bvec4 lessThan(ivec4 x, ivec4 y);"
s.append("bvec2 lessThanEqual(vec2 x, vec2 y);"); "bvec2 lessThanEqual(vec2 x, vec2 y);"
s.append("bvec3 lessThanEqual(vec3 x, vec3 y);"); "bvec3 lessThanEqual(vec3 x, vec3 y);"
s.append("bvec4 lessThanEqual(vec4 x, vec4 y);"); "bvec4 lessThanEqual(vec4 x, vec4 y);"
s.append("bvec2 lessThanEqual(ivec2 x, ivec2 y);"); "bvec2 lessThanEqual(ivec2 x, ivec2 y);"
s.append("bvec3 lessThanEqual(ivec3 x, ivec3 y);"); "bvec3 lessThanEqual(ivec3 x, ivec3 y);"
s.append("bvec4 lessThanEqual(ivec4 x, ivec4 y);"); "bvec4 lessThanEqual(ivec4 x, ivec4 y);"
s.append("bvec2 greaterThan(vec2 x, vec2 y);"); "bvec2 greaterThan(vec2 x, vec2 y);"
s.append("bvec3 greaterThan(vec3 x, vec3 y);"); "bvec3 greaterThan(vec3 x, vec3 y);"
s.append("bvec4 greaterThan(vec4 x, vec4 y);"); "bvec4 greaterThan(vec4 x, vec4 y);"
s.append("bvec2 greaterThan(ivec2 x, ivec2 y);"); "bvec2 greaterThan(ivec2 x, ivec2 y);"
s.append("bvec3 greaterThan(ivec3 x, ivec3 y);"); "bvec3 greaterThan(ivec3 x, ivec3 y);"
s.append("bvec4 greaterThan(ivec4 x, ivec4 y);"); "bvec4 greaterThan(ivec4 x, ivec4 y);"
s.append("bvec2 greaterThanEqual(vec2 x, vec2 y);"); "bvec2 greaterThanEqual(vec2 x, vec2 y);"
s.append("bvec3 greaterThanEqual(vec3 x, vec3 y);"); "bvec3 greaterThanEqual(vec3 x, vec3 y);"
s.append("bvec4 greaterThanEqual(vec4 x, vec4 y);"); "bvec4 greaterThanEqual(vec4 x, vec4 y);"
s.append("bvec2 greaterThanEqual(ivec2 x, ivec2 y);"); "bvec2 greaterThanEqual(ivec2 x, ivec2 y);"
s.append("bvec3 greaterThanEqual(ivec3 x, ivec3 y);"); "bvec3 greaterThanEqual(ivec3 x, ivec3 y);"
s.append("bvec4 greaterThanEqual(ivec4 x, ivec4 y);"); "bvec4 greaterThanEqual(ivec4 x, ivec4 y);"
s.append("bvec2 equal(vec2 x, vec2 y);"); "bvec2 equal(vec2 x, vec2 y);"
s.append("bvec3 equal(vec3 x, vec3 y);"); "bvec3 equal(vec3 x, vec3 y);"
s.append("bvec4 equal(vec4 x, vec4 y);"); "bvec4 equal(vec4 x, vec4 y);"
s.append("bvec2 equal(ivec2 x, ivec2 y);"); "bvec2 equal(ivec2 x, ivec2 y);"
s.append("bvec3 equal(ivec3 x, ivec3 y);"); "bvec3 equal(ivec3 x, ivec3 y);"
s.append("bvec4 equal(ivec4 x, ivec4 y);"); "bvec4 equal(ivec4 x, ivec4 y);"
s.append("bvec2 equal(bvec2 x, bvec2 y);"); "bvec2 equal(bvec2 x, bvec2 y);"
s.append("bvec3 equal(bvec3 x, bvec3 y);"); "bvec3 equal(bvec3 x, bvec3 y);"
s.append("bvec4 equal(bvec4 x, bvec4 y);"); "bvec4 equal(bvec4 x, bvec4 y);"
s.append("bvec2 notEqual(vec2 x, vec2 y);"); "bvec2 notEqual(vec2 x, vec2 y);"
s.append("bvec3 notEqual(vec3 x, vec3 y);"); "bvec3 notEqual(vec3 x, vec3 y);"
s.append("bvec4 notEqual(vec4 x, vec4 y);"); "bvec4 notEqual(vec4 x, vec4 y);"
s.append("bvec2 notEqual(ivec2 x, ivec2 y);"); "bvec2 notEqual(ivec2 x, ivec2 y);"
s.append("bvec3 notEqual(ivec3 x, ivec3 y);"); "bvec3 notEqual(ivec3 x, ivec3 y);"
s.append("bvec4 notEqual(ivec4 x, ivec4 y);"); "bvec4 notEqual(ivec4 x, ivec4 y);"
s.append("bvec2 notEqual(bvec2 x, bvec2 y);"); "bvec2 notEqual(bvec2 x, bvec2 y);"
s.append("bvec3 notEqual(bvec3 x, bvec3 y);"); "bvec3 notEqual(bvec3 x, bvec3 y);"
s.append("bvec4 notEqual(bvec4 x, bvec4 y);"); "bvec4 notEqual(bvec4 x, bvec4 y);"
s.append("bool any(bvec2 x);"); "bool any(bvec2 x);"
s.append("bool any(bvec3 x);"); "bool any(bvec3 x);"
s.append("bool any(bvec4 x);"); "bool any(bvec4 x);"
s.append("bool all(bvec2 x);"); "bool all(bvec2 x);"
s.append("bool all(bvec3 x);"); "bool all(bvec3 x);"
s.append("bool all(bvec4 x);"); "bool all(bvec4 x);"
s.append("bvec2 not(bvec2 x);"); "bvec2 not(bvec2 x);"
s.append("bvec3 not(bvec3 x);"); "bvec3 not(bvec3 x);"
s.append("bvec4 not(bvec4 x);"); "bvec4 not(bvec4 x);"
s.append("\n"); "\n");
// //
// Original-style texture functions existing in both stages. // Original-style texture functions existing in both stages.
...@@ -599,98 +622,106 @@ void TBuiltIns::initialize(int version, EProfile profile) ...@@ -599,98 +622,106 @@ void TBuiltIns::initialize(int version, EProfile profile)
// //
if ((profile == EEsProfile && version == 100) || if ((profile == EEsProfile && version == 100) ||
profile == ECompatibilityProfile || profile == ECompatibilityProfile ||
version < FirstProfileVersion) { version < 150) {
s.append("vec4 texture2D(sampler2D, vec2);"); commonBuiltins.append(
"vec4 texture2D(sampler2D, vec2);"
s.append("vec4 texture2DProj(sampler2D, vec3);"); "vec4 texture2DProj(sampler2D, vec3);"
s.append("vec4 texture2DProj(sampler2D, vec4);"); "vec4 texture2DProj(sampler2D, vec4);"
s.append("vec4 textureCube(samplerCube, vec3);"); "vec4 textureCube(samplerCube, vec3);"
"\n");
} }
if (profile != EEsProfile && if (profile != EEsProfile &&
(profile == ECompatibilityProfile || version < FirstProfileVersion)) { (profile == ECompatibilityProfile || version < 150)) {
s.append("vec4 texture1D(sampler1D, float);"); commonBuiltins.append(
"vec4 texture1D(sampler1D, float);"
"vec4 texture1DProj(sampler1D, vec2);"
"vec4 texture1DProj(sampler1D, vec4);"
s.append("vec4 texture1DProj(sampler1D, vec2);"); "vec4 texture3D(sampler3D, vec3);"
s.append("vec4 texture1DProj(sampler1D, vec4);"); "vec4 texture3DProj(sampler3D, vec4);"
s.append("vec4 texture3D(sampler3D, vec3);"); "vec4 shadow1D(sampler1DShadow, vec3);"
s.append("vec4 texture3DProj(sampler3D, vec4);"); "vec4 shadow2D(sampler2DShadow, vec3);"
"vec4 shadow1DProj(sampler1DShadow, vec4);"
"vec4 shadow2DProj(sampler2DShadow, vec4);"
s.append("vec4 shadow1D(sampler1DShadow, vec3);"); "\n");
s.append("vec4 shadow2D(sampler2DShadow, vec3);");
s.append("vec4 shadow1DProj(sampler1DShadow, vec4);");
s.append("vec4 shadow2DProj(sampler2DShadow, vec4);");
// TODO: functionality: non-ES legacy texuring for Lod, others? // TODO: functionality: non-ES legacy texturing for Lod, others?
} }
s.append("\n");
// //
// Noise functions. // Noise functions.
// //
if (profile != EEsProfile) { if (profile != EEsProfile) {
s.append("float noise1(float x);"); commonBuiltins.append(
s.append("float noise1(vec2 x);"); "float noise1(float x);"
s.append("float noise1(vec3 x);"); "float noise1(vec2 x);"
s.append("float noise1(vec4 x);"); "float noise1(vec3 x);"
"float noise1(vec4 x);"
s.append("vec2 noise2(float x);");
s.append("vec2 noise2(vec2 x);");
s.append("vec2 noise2(vec3 x);");
s.append("vec2 noise2(vec4 x);");
s.append("vec3 noise3(float x);");
s.append("vec3 noise3(vec2 x);");
s.append("vec3 noise3(vec3 x);");
s.append("vec3 noise3(vec4 x);");
s.append("vec4 noise4(float x);");
s.append("vec4 noise4(vec2 x);");
s.append("vec4 noise4(vec3 x);");
s.append("vec4 noise4(vec4 x);");
s.append("\n"); "vec2 noise2(float x);"
} "vec2 noise2(vec2 x);"
"vec2 noise2(vec3 x);"
"vec2 noise2(vec4 x);"
"vec3 noise3(float x);"
"vec3 noise3(vec2 x);"
"vec3 noise3(vec3 x);"
"vec3 noise3(vec4 x);"
"vec4 noise4(float x);"
"vec4 noise4(vec2 x);"
"vec4 noise4(vec3 x);"
"vec4 noise4(vec4 x);"
"\n");
} }
{
//============================================================================ //============================================================================
// //
// Prototypes for built-in functions seen by vertex shaders only. // Prototypes for built-in functions seen by vertex shaders only.
// //
//============================================================================ //============================================================================
TString& s = stageBuiltins[EShLangVertex];
// //
// Geometric Functions. // Geometric Functions.
// //
if (profile != EEsProfile) if (IncludeLegacy(version, profile))
s.append("vec4 ftransform();"); stageBuiltins[EShLangVertex].append("vec4 ftransform();");
// //
// Original-style texture Functions with lod. // Original-style texture Functions with lod.
// //
if (profile != EEsProfile || version == 100) { if (profile != EEsProfile || version == 100) {
s.append("vec4 texture2DLod(sampler2D, vec2, float);"); stageBuiltins[EShLangVertex].append(
s.append("vec4 texture2DProjLod(sampler2D, vec3, float);"); "vec4 texture2DLod(sampler2D, vec2, float);"
s.append("vec4 texture2DProjLod(sampler2D, vec4, float);"); "vec4 texture2DProjLod(sampler2D, vec3, float);"
s.append("vec4 textureCubeLod(samplerCube, vec3, float);"); "vec4 texture2DProjLod(sampler2D, vec4, float);"
"vec4 textureCubeLod(samplerCube, vec3, float);"
"\n");
} }
if (profile != EEsProfile && version > 100) { if (profile != EEsProfile && version > 100) {
s.append("vec4 texture1DLod(sampler1D, float, float);"); stageBuiltins[EShLangVertex].append(
s.append("vec4 texture1DProjLod(sampler1D, vec2, float);"); "vec4 texture1DLod(sampler1D, float, float);"
s.append("vec4 texture1DProjLod(sampler1D, vec4, float);"); "vec4 texture1DProjLod(sampler1D, vec2, float);"
s.append("vec4 texture3DLod(sampler3D, vec3, float);"); "vec4 texture1DProjLod(sampler1D, vec4, float);"
s.append("vec4 texture3DProjLod(sampler3D, vec4, float);"); "vec4 texture3DLod(sampler3D, vec3, float);"
s.append("vec4 shadow1DLod(sampler1DShadow, vec3, float);"); "vec4 texture3DProjLod(sampler3D, vec4, float);"
s.append("vec4 shadow2DLod(sampler2DShadow, vec3, float);"); "vec4 shadow1DLod(sampler1DShadow, vec3, float);"
s.append("vec4 shadow1DProjLod(sampler1DShadow, vec4, float);"); "vec4 shadow2DLod(sampler2DShadow, vec3, float);"
s.append("vec4 shadow2DProjLod(sampler2DShadow, vec4, float);"); "vec4 shadow1DProjLod(sampler1DShadow, vec4, float);"
} "vec4 shadow2DProjLod(sampler2DShadow, vec4, float);"
s.append("\n");
"\n");
} }
if (profile != EEsProfile && version >= 150) { if (profile != EEsProfile && version >= 150) {
//============================================================================ //============================================================================
// //
...@@ -698,15 +729,17 @@ void TBuiltIns::initialize(int version, EProfile profile) ...@@ -698,15 +729,17 @@ void TBuiltIns::initialize(int version, EProfile profile)
// //
//============================================================================ //============================================================================
TString& s = stageBuiltins[EShLangGeometry];
if (version >= 400) { if (version >= 400) {
s.append("void EmitStreamVertex(int);"); stageBuiltins[EShLangGeometry].append(
s.append("void EndStreamPrimitive(int);"); "void EmitStreamVertex(int);"
"void EndStreamPrimitive(int);"
);
} }
s.append("void EmitVertex();"); stageBuiltins[EShLangGeometry].append(
s.append("void EndPrimitive();"); "void EmitVertex();"
s.append("\n"); "void EndPrimitive();"
"\n");
} }
if (profile != EEsProfile) { if (profile != EEsProfile) {
//============================================================================ //============================================================================
...@@ -716,305 +749,642 @@ void TBuiltIns::initialize(int version, EProfile profile) ...@@ -716,305 +749,642 @@ void TBuiltIns::initialize(int version, EProfile profile)
//============================================================================ //============================================================================
if (version >= 400) if (version >= 400)
stageBuiltins[EShLangTessControl].append("void barrier();"); stageBuiltins[EShLangTessControl].append(
"void barrier();"
);
if (version >= 430) if (version >= 430)
stageBuiltins[EShLangCompute].append("void barrier();"); stageBuiltins[EShLangCompute].append(
"void barrier();"
);
if (version >= 420) if (version >= 420)
commonBuiltins.append("void memoryBarrier();"); commonBuiltins.append(
"void memoryBarrier();"
);
if (version >= 430) { if (version >= 430) {
commonBuiltins.append("void memoryBarrierAtomicCounter();"); commonBuiltins.append(
commonBuiltins.append("void memoryBarrierBuffer();"); "void memoryBarrierAtomicCounter();"
commonBuiltins.append("void memoryBarrierImage();"); "void memoryBarrierBuffer();"
stageBuiltins[EShLangCompute].append("void memoryBarrierShared();"); "void memoryBarrierImage();"
stageBuiltins[EShLangCompute].append("void groupMemoryBarrier();"); );
stageBuiltins[EShLangCompute].append(
"void memoryBarrierShared();"
"void groupMemoryBarrier();"
);
} }
} }
{
//============================================================================ //============================================================================
// //
// Prototypes for built-in functions seen by fragment shaders only. // Prototypes for built-in functions seen by fragment shaders only.
// //
//============================================================================ //============================================================================
TString& s = stageBuiltins[EShLangFragment];
// //
// Original-style texture Functions with bias. // Original-style texture Functions with bias.
// //
if (profile != EEsProfile || version == 100) { if (profile != EEsProfile || version == 100) {
s.append("vec4 texture2D(sampler2D, vec2, float);"); stageBuiltins[EShLangFragment].append(
s.append("vec4 texture2DProj(sampler2D, vec3, float);"); "vec4 texture2D(sampler2D, vec2, float);"
s.append("vec4 texture2DProj(sampler2D, vec4, float);"); "vec4 texture2DProj(sampler2D, vec3, float);"
s.append("vec4 textureCube(samplerCube, vec3, float);"); "vec4 texture2DProj(sampler2D, vec4, float);"
"vec4 textureCube(samplerCube, vec3, float);"
"\n");
} }
if (profile != EEsProfile && version > 100) { if (profile != EEsProfile && version > 100) {
s.append("vec4 texture1D(sampler1D, float, float);"); stageBuiltins[EShLangFragment].append(
s.append("vec4 texture1DProj(sampler1D, vec2, float);"); "vec4 texture1D(sampler1D, float, float);"
s.append("vec4 texture1DProj(sampler1D, vec4, float);"); "vec4 texture1DProj(sampler1D, vec2, float);"
s.append("vec4 texture3D(sampler3D, vec3, float);"); "vec4 texture1DProj(sampler1D, vec4, float);"
s.append("vec4 texture3DProj(sampler3D, vec4, float);"); "vec4 texture3D(sampler3D, vec3, float);"
s.append("vec4 shadow1D(sampler1DShadow, vec3, float);"); "vec4 texture3DProj(sampler3D, vec4, float);"
s.append("vec4 shadow2D(sampler2DShadow, vec3, float);"); "vec4 shadow1D(sampler1DShadow, vec3, float);"
s.append("vec4 shadow1DProj(sampler1DShadow, vec4, float);"); "vec4 shadow2D(sampler2DShadow, vec3, float);"
s.append("vec4 shadow2DProj(sampler2DShadow, vec4, float);"); "vec4 shadow1DProj(sampler1DShadow, vec4, float);"
} "vec4 shadow2DProj(sampler2DShadow, vec4, float);"
s.append("float dFdx(float p);"); "\n");
s.append("vec2 dFdx(vec2 p);"); }
s.append("vec3 dFdx(vec3 p);");
s.append("vec4 dFdx(vec4 p);"); stageBuiltins[EShLangFragment].append(
"float dFdx(float p);"
s.append("float dFdy(float p);"); "vec2 dFdx(vec2 p);"
s.append("vec2 dFdy(vec2 p);"); "vec3 dFdx(vec3 p);"
s.append("vec3 dFdy(vec3 p);"); "vec4 dFdx(vec4 p);"
s.append("vec4 dFdy(vec4 p);");
"float dFdy(float p);"
s.append("float fwidth(float p);"); "vec2 dFdy(vec2 p);"
s.append("vec2 fwidth(vec2 p);"); "vec3 dFdy(vec3 p);"
s.append("vec3 fwidth(vec3 p);"); "vec4 dFdy(vec4 p);"
s.append("vec4 fwidth(vec4 p);");
"float fwidth(float p);"
"vec2 fwidth(vec2 p);"
"vec3 fwidth(vec3 p);"
"vec4 fwidth(vec4 p);"
"\n");
s.append("\n");
}
{
//============================================================================ //============================================================================
// //
// Standard Uniforms // Standard Uniforms
// //
//============================================================================ //============================================================================
TString& s = commonBuiltins;
// //
// Depth range in window coordinates, p. 33 // Depth range in window coordinates, p. 33
// //
s.append("struct gl_DepthRangeParameters {"); commonBuiltins.append(
"struct gl_DepthRangeParameters {"
);
if (profile == EEsProfile) { if (profile == EEsProfile) {
s.append(" highp float near;"); // n commonBuiltins.append(
s.append(" highp float far;"); // f "highp float near;" // n
s.append(" highp float diff;"); // f - n "highp float far;" // f
"highp float diff;" // f - n
);
} else { } else {
s.append(" float near;"); // n commonBuiltins.append(
s.append(" float far;"); // f "float near;" // n
s.append(" float diff;"); // f - n "float far;" // f
"float diff;" // f - n
);
} }
s.append("};"); commonBuiltins.append(
s.append("uniform gl_DepthRangeParameters gl_DepthRange;"); "};"
"uniform gl_DepthRangeParameters gl_DepthRange;"
"\n");
if (profile != EEsProfile && (version < FirstProfileVersion || profile == ECompatibilityProfile)) { if (IncludeLegacy(version, profile)) {
// //
// Matrix state. p. 31, 32, 37, 39, 40. // Matrix state. p. 31, 32, 37, 39, 40.
// //
s.append("uniform mat4 gl_ModelViewMatrix;"); commonBuiltins.append(
s.append("uniform mat4 gl_ProjectionMatrix;"); "uniform mat4 gl_ModelViewMatrix;"
s.append("uniform mat4 gl_ModelViewProjectionMatrix;"); "uniform mat4 gl_ProjectionMatrix;"
"uniform mat4 gl_ModelViewProjectionMatrix;"
// //
// Derived matrix state that provides inverse and transposed versions // Derived matrix state that provides inverse and transposed versions
// of the matrices above. // of the matrices above.
// //
s.append("uniform mat3 gl_NormalMatrix;"); "uniform mat3 gl_NormalMatrix;"
s.append("uniform mat4 gl_ModelViewMatrixInverse;"); "uniform mat4 gl_ModelViewMatrixInverse;"
s.append("uniform mat4 gl_ProjectionMatrixInverse;"); "uniform mat4 gl_ProjectionMatrixInverse;"
s.append("uniform mat4 gl_ModelViewProjectionMatrixInverse;"); "uniform mat4 gl_ModelViewProjectionMatrixInverse;"
s.append("uniform mat4 gl_ModelViewMatrixTranspose;"); "uniform mat4 gl_ModelViewMatrixTranspose;"
s.append("uniform mat4 gl_ProjectionMatrixTranspose;"); "uniform mat4 gl_ProjectionMatrixTranspose;"
s.append("uniform mat4 gl_ModelViewProjectionMatrixTranspose;"); "uniform mat4 gl_ModelViewProjectionMatrixTranspose;"
s.append("uniform mat4 gl_ModelViewMatrixInverseTranspose;"); "uniform mat4 gl_ModelViewMatrixInverseTranspose;"
s.append("uniform mat4 gl_ProjectionMatrixInverseTranspose;"); "uniform mat4 gl_ProjectionMatrixInverseTranspose;"
s.append("uniform mat4 gl_ModelViewProjectionMatrixInverseTranspose;"); "uniform mat4 gl_ModelViewProjectionMatrixInverseTranspose;"
// //
// Normal scaling p. 39. // Normal scaling p. 39.
// //
s.append("uniform float gl_NormalScale;"); "uniform float gl_NormalScale;"
// //
// Point Size, p. 66, 67. // Point Size, p. 66, 67.
// //
s.append("struct gl_PointParameters {"); "struct gl_PointParameters {"
s.append(" float size;"); "float size;"
s.append(" float sizeMin;"); "float sizeMin;"
s.append(" float sizeMax;"); "float sizeMax;"
s.append(" float fadeThresholdSize;"); "float fadeThresholdSize;"
s.append(" float distanceConstantAttenuation;"); "float distanceConstantAttenuation;"
s.append(" float distanceLinearAttenuation;"); "float distanceLinearAttenuation;"
s.append(" float distanceQuadraticAttenuation;"); "float distanceQuadraticAttenuation;"
s.append("};"); "};"
s.append("uniform gl_PointParameters gl_Point;"); "uniform gl_PointParameters gl_Point;"
// //
// Material State p. 50, 55. // Material State p. 50, 55.
// //
s.append("struct gl_MaterialParameters {"); "struct gl_MaterialParameters {"
s.append(" vec4 emission;"); // Ecm "vec4 emission;" // Ecm
s.append(" vec4 ambient;"); // Acm "vec4 ambient;" // Acm
s.append(" vec4 diffuse;"); // Dcm "vec4 diffuse;" // Dcm
s.append(" vec4 specular;"); // Scm "vec4 specular;" // Scm
s.append(" float shininess;"); // Srm "float shininess;" // Srm
s.append("};"); "};"
s.append("uniform gl_MaterialParameters gl_FrontMaterial;"); "uniform gl_MaterialParameters gl_FrontMaterial;"
s.append("uniform gl_MaterialParameters gl_BackMaterial;"); "uniform gl_MaterialParameters gl_BackMaterial;"
// //
// Light State p 50, 53, 55. // Light State p 50, 53, 55.
// //
"struct gl_LightSourceParameters {"
s.append("struct gl_LightSourceParameters {"); "vec4 ambient;" // Acli
s.append(" vec4 ambient;"); // Acli "vec4 diffuse;" // Dcli
s.append(" vec4 diffuse;"); // Dcli "vec4 specular;" // Scli
s.append(" vec4 specular;"); // Scli "vec4 position;" // Ppli
s.append(" vec4 position;"); // Ppli "vec4 halfVector;" // Derived: Hi
s.append(" vec4 halfVector;"); // Derived: Hi "vec3 spotDirection;" // Sdli
s.append(" vec3 spotDirection;"); // Sdli "float spotExponent;" // Srli
s.append(" float spotExponent;"); // Srli "float spotCutoff;" // Crli
s.append(" float spotCutoff;"); // Crli
// (range: [0.0,90.0], 180.0) // (range: [0.0,90.0], 180.0)
s.append(" float spotCosCutoff;"); // Derived: cos(Crli) "float spotCosCutoff;" // Derived: cos(Crli)
// (range: [1.0,0.0],-1.0) // (range: [1.0,0.0],-1.0)
s.append(" float constantAttenuation;"); // K0 "float constantAttenuation;" // K0
s.append(" float linearAttenuation;"); // K1 "float linearAttenuation;" // K1
s.append(" float quadraticAttenuation;");// K2 "float quadraticAttenuation;"// K2
s.append("};"); "};"
s.append("struct gl_LightModelParameters {"); "struct gl_LightModelParameters {"
s.append(" vec4 ambient;"); // Acs "vec4 ambient;" // Acs
s.append("};"); "};"
s.append("uniform gl_LightModelParameters gl_LightModel;"); "uniform gl_LightModelParameters gl_LightModel;"
// //
// Derived state from products of light and material. // Derived state from products of light and material.
// //
"struct gl_LightModelProducts {"
"vec4 sceneColor;" // Derived. Ecm + Acm * Acs
"};"
s.append("struct gl_LightModelProducts {"); "uniform gl_LightModelProducts gl_FrontLightModelProduct;"
s.append(" vec4 sceneColor;"); // Derived. Ecm + Acm * Acs "uniform gl_LightModelProducts gl_BackLightModelProduct;"
s.append("};");
s.append("uniform gl_LightModelProducts gl_FrontLightModelProduct;"); "struct gl_LightProducts {"
s.append("uniform gl_LightModelProducts gl_BackLightModelProduct;"); "vec4 ambient;" // Acm * Acli
"vec4 diffuse;" // Dcm * Dcli
s.append("struct gl_LightProducts {"); "vec4 specular;" // Scm * Scli
s.append(" vec4 ambient;"); // Acm * Acli "};"
s.append(" vec4 diffuse;"); // Dcm * Dcli
s.append(" vec4 specular;"); // Scm * Scli
s.append("};");
// //
// Fog p. 161 // Fog p. 161
// //
s.append("struct gl_FogParameters {"); "struct gl_FogParameters {"
s.append(" vec4 color;"); "vec4 color;"
s.append(" float density;"); "float density;"
s.append(" float start;"); "float start;"
s.append(" float end;"); "float end;"
s.append(" float scale;"); // 1 / (gl_FogEnd - gl_FogStart) "float scale;" // 1 / (gl_FogEnd - gl_FogStart)
s.append("};"); "};"
"uniform gl_FogParameters gl_Fog;"
s.append("uniform gl_FogParameters gl_Fog;"); "\n");
} }
s.append("\n"); //============================================================================
//
// Define the interface to the compute shader.
//
//============================================================================
if (version >= 430) {
stageBuiltins[EShLangCompute].append(
"in uvec3 gl_NumWorkGroups;"
// TODO: compute shader: constant with no initializer "const uvec3 gl_WorkGroupSize;"
"in uvec3 gl_WorkGroupID;"
"in uvec3 gl_LocalInvocationID;"
"in uvec3 gl_GlobalInvocationID;"
"in uint gl_LocalInvocationIndex;"
"\n");
} }
//============================================================================ //============================================================================
// //
// Vertex attributes, p. 19. // Define the interface to the vertex shader.
// //
//============================================================================ //============================================================================
if (profile != EEsProfile) { if (profile != EEsProfile) {
TString& s = stageBuiltins[EShLangVertex];
if (version < 130) { if (version < 130) {
s.append("attribute vec4 gl_Color;"); stageBuiltins[EShLangVertex].append(
s.append("attribute vec4 gl_SecondaryColor;"); "attribute vec4 gl_Color;"
s.append("attribute vec3 gl_Normal;"); "attribute vec4 gl_SecondaryColor;"
s.append("attribute vec4 gl_Vertex;"); "attribute vec3 gl_Normal;"
s.append("attribute vec4 gl_MultiTexCoord0;"); "attribute vec4 gl_Vertex;"
s.append("attribute vec4 gl_MultiTexCoord1;"); "attribute vec4 gl_MultiTexCoord0;"
s.append("attribute vec4 gl_MultiTexCoord2;"); "attribute vec4 gl_MultiTexCoord1;"
s.append("attribute vec4 gl_MultiTexCoord3;"); "attribute vec4 gl_MultiTexCoord2;"
s.append("attribute vec4 gl_MultiTexCoord4;"); "attribute vec4 gl_MultiTexCoord3;"
s.append("attribute vec4 gl_MultiTexCoord5;"); "attribute vec4 gl_MultiTexCoord4;"
s.append("attribute vec4 gl_MultiTexCoord6;"); "attribute vec4 gl_MultiTexCoord5;"
s.append("attribute vec4 gl_MultiTexCoord7;"); "attribute vec4 gl_MultiTexCoord6;"
s.append("attribute float gl_FogCoord;"); "attribute vec4 gl_MultiTexCoord7;"
} else if (version < FirstProfileVersion || profile == ECompatibilityProfile) { "attribute float gl_FogCoord;"
s.append("in vec4 gl_Color;"); "\n");
s.append("in vec4 gl_SecondaryColor;"); } else if (IncludeLegacy(version, profile)) {
s.append("in vec3 gl_Normal;"); stageBuiltins[EShLangVertex].append(
s.append("in vec4 gl_Vertex;"); "in vec4 gl_Color;"
s.append("in vec4 gl_MultiTexCoord0;"); "in vec4 gl_SecondaryColor;"
s.append("in vec4 gl_MultiTexCoord1;"); "in vec3 gl_Normal;"
s.append("in vec4 gl_MultiTexCoord2;"); "in vec4 gl_Vertex;"
s.append("in vec4 gl_MultiTexCoord3;"); "in vec4 gl_MultiTexCoord0;"
s.append("in vec4 gl_MultiTexCoord4;"); "in vec4 gl_MultiTexCoord1;"
s.append("in vec4 gl_MultiTexCoord5;"); "in vec4 gl_MultiTexCoord2;"
s.append("in vec4 gl_MultiTexCoord6;"); "in vec4 gl_MultiTexCoord3;"
s.append("in vec4 gl_MultiTexCoord7;"); "in vec4 gl_MultiTexCoord4;"
s.append("in float gl_FogCoord;"); "in vec4 gl_MultiTexCoord5;"
"in vec4 gl_MultiTexCoord6;"
"in vec4 gl_MultiTexCoord7;"
"in float gl_FogCoord;"
"\n");
}
if (version < 150) {
if (version < 130) {
stageBuiltins[EShLangVertex].append(
" vec4 gl_ClipVertex;" // needs qualifier fixed later
"varying vec4 gl_FrontColor;"
"varying vec4 gl_BackColor;"
"varying vec4 gl_FrontSecondaryColor;"
"varying vec4 gl_BackSecondaryColor;"
"varying vec4 gl_TexCoord[];"
"varying float gl_FogFragCoord;"
"\n");
} else if (IncludeLegacy(version, profile)) {
stageBuiltins[EShLangVertex].append(
" vec4 gl_ClipVertex;" // needs qualifier fixed later
"out vec4 gl_FrontColor;"
"out vec4 gl_BackColor;"
"out vec4 gl_FrontSecondaryColor;"
"out vec4 gl_BackSecondaryColor;"
"out vec4 gl_TexCoord[];"
"out float gl_FogFragCoord;"
"\n");
}
stageBuiltins[EShLangVertex].append(
"vec4 gl_Position;" // needs qualifier fixed later
"float gl_PointSize;" // needs qualifier fixed later
);
if (version == 130 || version == 140)
stageBuiltins[EShLangVertex].append(
"out float gl_ClipDistance[];"
);
} else {
// version >= 150
stageBuiltins[EShLangVertex].append(
"out gl_PerVertex {"
"vec4 gl_Position;" // needs qualifier fixed later
"float gl_PointSize;" // needs qualifier fixed later
"float gl_ClipDistance[];"
);
if (IncludeLegacy(version, profile))
stageBuiltins[EShLangVertex].append(
"vec4 gl_ClipVertex;" // needs qualifier fixed later
"vec4 gl_FrontColor;"
"vec4 gl_BackColor;"
"vec4 gl_FrontSecondaryColor;"
"vec4 gl_BackSecondaryColor;"
"vec4 gl_TexCoord[];"
"float gl_FogFragCoord;"
);
stageBuiltins[EShLangVertex].append(
"};"
"\n");
} }
if (version >= 130)
stageBuiltins[EShLangVertex].append(
"int gl_VertexID;" // needs qualifier fixed later
);
if (version >= 140)
stageBuiltins[EShLangVertex].append(
"int gl_InstanceID;" // needs qualifier fixed later
);
} else {
// ES profile
if (version == 100) {
stageBuiltins[EShLangVertex].append(
"highp vec4 gl_Position;" // needs qualifier fixed later
"mediump float gl_PointSize;" // needs qualifier fixed later
);
} else {
stageBuiltins[EShLangVertex].append(
"highp int gl_VertexID;" // needs qualifier fixed later
"highp int gl_InstanceID;" // needs qualifier fixed later
s.append("\n"); "highp vec4 gl_Position;" // needs qualifier fixed later
"highp float gl_PointSize;" // needs qualifier fixed later
);
}
} }
//============================================================================ //============================================================================
// //
// Define the output varying interface from the vertex shader. // Define the interface to the geometry shader.
// //
//============================================================================ //============================================================================
if (profile != EEsProfile) { if (profile == ECoreProfile || profile == ECompatibilityProfile) {
TString& s = stageBuiltins[EShLangVertex]; stageBuiltins[EShLangGeometry].append(
"in gl_PerVertex {"
"vec4 gl_Position;"
"float gl_PointSize;"
"float gl_ClipDistance[];"
);
if (profile == ECompatibilityProfile)
stageBuiltins[EShLangGeometry].append(
"vec4 gl_ClipVertex;"
"vec4 gl_FrontColor;"
"vec4 gl_BackColor;"
"vec4 gl_FrontSecondaryColor;"
"vec4 gl_BackSecondaryColor;"
"vec4 gl_TexCoord[];"
"float gl_FogFragCoord;"
);
stageBuiltins[EShLangGeometry].append(
"} gl_in[];"
"in int gl_PrimitiveIDIn;"
"out gl_PerVertex {"
"vec4 gl_Position;"
"float gl_PointSize;"
"float gl_ClipDistance[];"
"\n");
if (version >= 400 && profile == ECompatibilityProfile)
stageBuiltins[EShLangGeometry].append(
"vec4 gl_ClipVertex;"
"vec4 gl_FrontColor;"
"vec4 gl_BackColor;"
"vec4 gl_FrontSecondaryColor;"
"vec4 gl_BackSecondaryColor;"
"vec4 gl_TexCoord[];"
"float gl_FogFragCoord;"
);
stageBuiltins[EShLangGeometry].append(
"};"
"out int gl_PrimitiveID;"
"out int gl_Layer;"
"\n");
if (version < 400 && profile == ECompatibilityProfile)
stageBuiltins[EShLangGeometry].append(
"out vec4 gl_ClipVertex;"
);
if (version < 130) { if (version >= 400)
s.append("varying vec4 gl_FrontColor;"); stageBuiltins[EShLangGeometry].append(
s.append("varying vec4 gl_BackColor;"); "in int gl_InvocationID;"
s.append("varying vec4 gl_FrontSecondaryColor;"); );
s.append("varying vec4 gl_BackSecondaryColor;"); if (version >= 410)
s.append("varying vec4 gl_TexCoord[];"); stageBuiltins[EShLangGeometry].append(
s.append("varying float gl_FogFragCoord;"); "out int gl_ViewportIndex;"
} else if (version < FirstProfileVersion || profile == ECompatibilityProfile) { );
s.append("out vec4 gl_FrontColor;");
s.append("out vec4 gl_BackColor;");
s.append("out vec4 gl_FrontSecondaryColor;");
s.append("out vec4 gl_BackSecondaryColor;");
s.append("out vec4 gl_TexCoord[];");
s.append("out float gl_FogFragCoord;");
} }
s.append("\n"); //============================================================================
//
// Define the interface to the tessellation control shader.
//
//============================================================================
if (version >= 400) {
// TODO: tessellation: gl_MaxPatchVertices below needs to move to resources mechanism
stageBuiltins[EShLangTessControl].append(
"const int gl_MaxPatchVertices = 32;"
);
stageBuiltins[EShLangTessControl].append(
"in gl_PerVertex {"
"vec4 gl_Position;"
"float gl_PointSize;"
"float gl_ClipDistance[];"
);
if (profile == ECompatibilityProfile)
stageBuiltins[EShLangTessControl].append(
"vec4 gl_ClipVertex;"
"vec4 gl_FrontColor;"
"vec4 gl_BackColor;"
"vec4 gl_FrontSecondaryColor;"
"vec4 gl_BackSecondaryColor;"
"vec4 gl_TexCoord[];"
"float gl_FogFragCoord;"
);
stageBuiltins[EShLangTessControl].append(
"} gl_in[gl_MaxPatchVertices];"
"in int gl_PatchVerticesIn;"
"in int gl_PrimitiveID;"
"in int gl_InvocationID;"
"out gl_PerVertex {"
"vec4 gl_Position;"
"float gl_PointSize;"
"float gl_ClipDistance[];"
);
if (profile == ECompatibilityProfile)
stageBuiltins[EShLangTessControl].append(
"vec4 gl_ClipVertex;"
"vec4 gl_FrontColor;"
"vec4 gl_BackColor;"
"vec4 gl_FrontSecondaryColor;"
"vec4 gl_BackSecondaryColor;"
"vec4 gl_TexCoord[];"
"float gl_FogFragCoord;"
);
stageBuiltins[EShLangTessControl].append(
"} gl_out[];"
"patch out float gl_TessLevelOuter[4];"
"patch out float gl_TessLevelInner[2];"
"\n");
} }
{
//============================================================================ //============================================================================
// //
// Define the input varying interface to the fragment shader. // Define the interface to the tessellation evaluation shader.
// //
//============================================================================ //============================================================================
if (profile != EEsProfile) { if (version >= 400) {
TString& s = stageBuiltins[EShLangFragment]; // TODO: tessellation: gl_MaxPatchVertices below needs to move to resources mechanism
if (version < 130) { stageBuiltins[EShLangTessEvaluation].append(
s.append("varying vec4 gl_Color;"); "const int gl_MaxPatchVertices = 32;"
s.append("varying vec4 gl_SecondaryColor;"); );
s.append("varying vec4 gl_TexCoord[];");
s.append("varying float gl_FogFragCoord;"); stageBuiltins[EShLangTessEvaluation].append(
} else if (version < FirstProfileVersion || profile == ECompatibilityProfile) { "in gl_PerVertex {"
s.append("in vec4 gl_Color;"); "vec4 gl_Position;"
s.append("in vec4 gl_SecondaryColor;"); "float gl_PointSize;"
s.append("in vec4 gl_TexCoord[];"); "float gl_ClipDistance[];"
s.append("in float gl_FogFragCoord;"); );
if (version >= 400 && profile == ECompatibilityProfile)
stageBuiltins[EShLangTessEvaluation].append(
"vec4 gl_ClipVertex;"
"vec4 gl_FrontColor;"
"vec4 gl_BackColor;"
"vec4 gl_FrontSecondaryColor;"
"vec4 gl_BackSecondaryColor;"
"vec4 gl_TexCoord[];"
"float gl_FogFragCoord;"
);
stageBuiltins[EShLangTessEvaluation].append(
"} gl_in[gl_MaxPatchVertices];"
"in int gl_PatchVerticesIn;"
"in int gl_PrimitiveID;"
"in vec3 gl_TessCoord;"
"patch in float gl_TessLevelOuter[4];"
"patch in float gl_TessLevelInner[2];"
"out gl_PerVertex {"
"vec4 gl_Position;"
"float gl_PointSize;"
"float gl_ClipDistance[];"
);
if (version >= 400 && profile == ECompatibilityProfile)
stageBuiltins[EShLangTessEvaluation].append(
"vec4 gl_ClipVertex;"
"vec4 gl_FrontColor;"
"vec4 gl_BackColor;"
"vec4 gl_FrontSecondaryColor;"
"vec4 gl_BackSecondaryColor;"
"vec4 gl_TexCoord[];"
"float gl_FogFragCoord;"
);
stageBuiltins[EShLangTessEvaluation].append(
"};"
"\n");
} }
s.append("\n"); //============================================================================
//
// Define the interface to the fragment shader.
//
//============================================================================
if (profile != EEsProfile) {
stageBuiltins[EShLangFragment].append(
"vec4 gl_FragCoord;" // needs qualifier fixed later
"bool gl_FrontFacing;" // needs qualifier fixed later
"float gl_FragDepth;" // needs qualifier fixed later
);
if (version >= 120)
stageBuiltins[EShLangFragment].append(
"vec2 gl_PointCoord;" // needs qualifier fixed later
);
if (IncludeLegacy(version, profile) || (! ForwardCompatibility && version < 420))
stageBuiltins[EShLangFragment].append(
"vec4 gl_FragColor;" // needs qualifier fixed later
);
if (version < 130) {
stageBuiltins[EShLangFragment].append(
"varying vec4 gl_Color;"
"varying vec4 gl_SecondaryColor;"
"varying vec4 gl_TexCoord[];"
"varying float gl_FogFragCoord;"
);
} else {
stageBuiltins[EShLangFragment].append(
"in float gl_ClipDistance[];"
);
if (IncludeLegacy(version, profile)) {
if (version < 410)
stageBuiltins[EShLangFragment].append(
"in float gl_FogFragCoord;"
"in vec4 gl_TexCoord[];"
"in vec4 gl_Color;"
"in vec4 gl_SecondaryColor;"
);
else
stageBuiltins[EShLangFragment].append(
"in gl_PerFragment {"
"in float gl_FogFragCoord;"
"in vec4 gl_TexCoord[];"
"in vec4 gl_Color;"
"in vec4 gl_SecondaryColor;"
"};"
);
} }
} }
if (version >= 150)
stageBuiltins[EShLangFragment].append(
"flat in int gl_PrimitiveID;"
);
if (version >= 400)
stageBuiltins[EShLangFragment].append(
"flat in int gl_SampleID;"
" in vec2 gl_SamplePosition;"
"flat in int gl_SampleMaskIn[];"
" out int gl_SampleMask[];"
);
if (version >= 430)
stageBuiltins[EShLangFragment].append(
"flat in int gl_Layer;"
"flat in int gl_ViewportIndex;"
);
} else {
// ES profile
if (version == 100)
stageBuiltins[EShLangFragment].append(
"mediump vec4 gl_FragCoord;" // needs qualifier fixed later
" bool gl_FrontFacing;" // needs qualifier fixed later
"mediump vec4 gl_FragColor;" // needs qualifier fixed later
"mediump vec2 gl_PointCoord;" // needs qualifier fixed later
);
else if (version == 300)
stageBuiltins[EShLangFragment].append(
"highp vec4 gl_FragCoord;" // needs qualifier fixed later
" bool gl_FrontFacing;" // needs qualifier fixed later
"mediump vec2 gl_PointCoord;" // needs qualifier fixed later
"highp float gl_FragDepth;" // needs qualifier fixed later
);
}
stageBuiltins[EShLangFragment].append("\n");
if (version >= 130) if (version >= 130)
add2ndGenerationSamplingImaging(version, profile); add2ndGenerationSamplingImaging(version, profile);
...@@ -1108,25 +1478,24 @@ void TBuiltIns::addQueryFunctions(TSampler sampler, TString& typeName, int versi ...@@ -1108,25 +1478,24 @@ void TBuiltIns::addQueryFunctions(TSampler sampler, TString& typeName, int versi
if (version < 430 && sampler.image) if (version < 430 && sampler.image)
return; return;
TString& s = commonBuiltins;
if (profile == EEsProfile) if (profile == EEsProfile)
s.append("highp "); commonBuiltins.append("highp ");
int dims = dimMap[sampler.dim] + (sampler.arrayed ? 1 : 0) - (sampler.dim == EsdCube ? 1 : 0); int dims = dimMap[sampler.dim] + (sampler.arrayed ? 1 : 0) - (sampler.dim == EsdCube ? 1 : 0);
if (dims == 1) if (dims == 1)
s.append("int"); commonBuiltins.append("int");
else { else {
s.append("ivec"); commonBuiltins.append("ivec");
s.append(postfixes[dims]); commonBuiltins.append(postfixes[dims]);
} }
if (sampler.image) if (sampler.image)
s.append(" imageSize("); commonBuiltins.append(" imageSize(");
else else
s.append(" textureSize("); commonBuiltins.append(" textureSize(");
s.append(typeName); commonBuiltins.append(typeName);
if (! sampler.image && sampler.dim != EsdRect && sampler.dim != EsdBuffer && ! sampler.ms) if (! sampler.image && sampler.dim != EsdRect && sampler.dim != EsdBuffer && ! sampler.ms)
s.append(",int);\n"); commonBuiltins.append(",int);\n");
else else
s.append(");\n"); commonBuiltins.append(");\n");
} }
// //
...@@ -1421,7 +1790,7 @@ void TBuiltIns::initialize(const TBuiltInResource &resources, int version, EProf ...@@ -1421,7 +1790,7 @@ void TBuiltIns::initialize(const TBuiltInResource &resources, int version, EProf
snprintf(builtInConstant, maxSize, "const int gl_MaxFragmentUniformComponents = %d;", resources.maxFragmentUniformComponents); snprintf(builtInConstant, maxSize, "const int gl_MaxFragmentUniformComponents = %d;", resources.maxFragmentUniformComponents);
s.append(builtInConstant); s.append(builtInConstant);
if (version < FirstProfileVersion || profile == ECompatibilityProfile) { if (IncludeLegacy(version, profile)) {
// //
// OpenGL'uniform' state. Page numbers are in reference to version // OpenGL'uniform' state. Page numbers are in reference to version
// 1.4 of the OpenGL specification. // 1.4 of the OpenGL specification.
...@@ -1430,47 +1799,53 @@ void TBuiltIns::initialize(const TBuiltInResource &resources, int version, EProf ...@@ -1430,47 +1799,53 @@ void TBuiltIns::initialize(const TBuiltInResource &resources, int version, EProf
// //
// Matrix state. p. 31, 32, 37, 39, 40. // Matrix state. p. 31, 32, 37, 39, 40.
// //
s.append("uniform mat4 gl_TextureMatrix[gl_MaxTextureCoords];"); s.append("uniform mat4 gl_TextureMatrix[gl_MaxTextureCoords];"
// //
// Derived matrix state that provides inverse and transposed versions // Derived matrix state that provides inverse and transposed versions
// of the matrices above. // of the matrices above.
// //
s.append("uniform mat4 gl_TextureMatrixInverse[gl_MaxTextureCoords];"); "uniform mat4 gl_TextureMatrixInverse[gl_MaxTextureCoords];"
s.append("uniform mat4 gl_TextureMatrixTranspose[gl_MaxTextureCoords];"); "uniform mat4 gl_TextureMatrixTranspose[gl_MaxTextureCoords];"
s.append("uniform mat4 gl_TextureMatrixInverseTranspose[gl_MaxTextureCoords];"); "uniform mat4 gl_TextureMatrixInverseTranspose[gl_MaxTextureCoords];"
// //
// Clip planes p. 42. // Clip planes p. 42.
// //
s.append("uniform vec4 gl_ClipPlane[gl_MaxClipPlanes];"); "uniform vec4 gl_ClipPlane[gl_MaxClipPlanes];"
// //
// Light State p 50, 53, 55. // Light State p 50, 53, 55.
// //
s.append("uniform gl_LightSourceParameters gl_LightSource[gl_MaxLights];"); "uniform gl_LightSourceParameters gl_LightSource[gl_MaxLights];"
// //
// Derived state from products of light. // Derived state from products of light.
// //
s.append("uniform gl_LightProducts gl_FrontLightProduct[gl_MaxLights];"); "uniform gl_LightProducts gl_FrontLightProduct[gl_MaxLights];"
s.append("uniform gl_LightProducts gl_BackLightProduct[gl_MaxLights];"); "uniform gl_LightProducts gl_BackLightProduct[gl_MaxLights];"
// //
// Texture Environment and Generation, p. 152, p. 40-42. // Texture Environment and Generation, p. 152, p. 40-42.
// //
s.append("uniform vec4 gl_TextureEnvColor[gl_MaxTextureImageUnits];"); "uniform vec4 gl_TextureEnvColor[gl_MaxTextureImageUnits];"
s.append("uniform vec4 gl_EyePlaneS[gl_MaxTextureCoords];"); "uniform vec4 gl_EyePlaneS[gl_MaxTextureCoords];"
s.append("uniform vec4 gl_EyePlaneT[gl_MaxTextureCoords];"); "uniform vec4 gl_EyePlaneT[gl_MaxTextureCoords];"
s.append("uniform vec4 gl_EyePlaneR[gl_MaxTextureCoords];"); "uniform vec4 gl_EyePlaneR[gl_MaxTextureCoords];"
s.append("uniform vec4 gl_EyePlaneQ[gl_MaxTextureCoords];"); "uniform vec4 gl_EyePlaneQ[gl_MaxTextureCoords];"
s.append("uniform vec4 gl_ObjectPlaneS[gl_MaxTextureCoords];"); "uniform vec4 gl_ObjectPlaneS[gl_MaxTextureCoords];"
s.append("uniform vec4 gl_ObjectPlaneT[gl_MaxTextureCoords];"); "uniform vec4 gl_ObjectPlaneT[gl_MaxTextureCoords];"
s.append("uniform vec4 gl_ObjectPlaneR[gl_MaxTextureCoords];"); "uniform vec4 gl_ObjectPlaneR[gl_MaxTextureCoords];"
s.append("uniform vec4 gl_ObjectPlaneQ[gl_MaxTextureCoords];"); "uniform vec4 gl_ObjectPlaneQ[gl_MaxTextureCoords];");
} }
if (version >= 130) {
snprintf(builtInConstant, maxSize, "const int gl_MaxClipDistances = %d;", resources.maxClipDistances);
s.append(builtInConstant);
}
} }
s.append("\n"); s.append("\n");
...@@ -1478,6 +1853,25 @@ void TBuiltIns::initialize(const TBuiltInResource &resources, int version, EProf ...@@ -1478,6 +1853,25 @@ void TBuiltIns::initialize(const TBuiltInResource &resources, int version, EProf
} }
// //
// To support special built-ins that have a special qualifier that cannot be declared textually
// in a shader, like gl_Position.
//
// This lets the type of the built-in be declared textually, and then have just its qualifier be
// updated afterward.
//
// Safe to call even if name is not present.
//
// N.B.: longer term, having special qualifiers is probably not the way to go, but this is keeping
// in place the legacy ones.
//
void SpecialQualifier(const char* name, TStorageQualifier qualifier, TSymbolTable& symbolTable)
{
TSymbol* symbol = symbolTable.find(name);
if (symbol)
symbol->getWritableType().getQualifier().storage = qualifier;
}
//
// Finish adding/processing context-independent built-in symbols. // Finish adding/processing context-independent built-in symbols.
// 1) Programmatically add symbols that could not be added by simple text strings above. // 1) Programmatically add symbols that could not be added by simple text strings above.
// 2) Map built-in functions to operators, for those that will turn into an operation node // 2) Map built-in functions to operators, for those that will turn into an operation node
...@@ -1485,59 +1879,31 @@ void TBuiltIns::initialize(const TBuiltInResource &resources, int version, EProf ...@@ -1485,59 +1879,31 @@ void TBuiltIns::initialize(const TBuiltInResource &resources, int version, EProf
// //
void IdentifyBuiltIns(int version, EProfile profile, EShLanguage language, TSymbolTable& symbolTable) void IdentifyBuiltIns(int version, EProfile profile, EShLanguage language, TSymbolTable& symbolTable)
{ {
TPrecisionQualifier pq;
// //
// First, insert some special built-in variables that are not in // First, insert some special built-in variables that are not in
// the built-in text strings. // the built-in text strings.
// //
switch(language) { switch(language) {
case EShLangVertex: case EShLangVertex:
pq = profile == EEsProfile ? EpqHigh : EpqNone; SpecialQualifier("gl_Position", EvqPosition, symbolTable);
symbolTable.insert(*new TVariable(NewPoolTString("gl_Position"), TType(EbtFloat, EvqPosition, pq, 4))); SpecialQualifier("gl_PointSize", EvqPointSize, symbolTable);
SpecialQualifier("gl_ClipVertex", EvqClipVertex, symbolTable);
pq = profile == EEsProfile ? (version > 100 ? EpqHigh : EpqMedium) : EpqNone; SpecialQualifier("gl_VertexID", EvqVertexId, symbolTable);
symbolTable.insert(*new TVariable(NewPoolTString("gl_PointSize"), TType(EbtFloat, EvqPointSize, pq, 1))); SpecialQualifier("gl_InstanceID", EvqInstanceId, symbolTable);
if (profile != EEsProfile)
symbolTable.insert(*new TVariable(NewPoolTString("gl_ClipVertex"), TType(EbtFloat, EvqClipVertex, 4)));
if (version >= 130) {
pq = profile == EEsProfile ? EpqHigh : EpqNone;
symbolTable.insert(*new TVariable(NewPoolTString("gl_VertexID"), TType(EbtInt, EvqVertexId, pq, 1)));
if (version >= 140)
symbolTable.insert(*new TVariable(NewPoolTString("gl_InstanceID"), TType(EbtInt, EvqInstanceId, pq, 1)));
}
break; break;
case EShLangTessControl: case EShLangTessControl:
case EShLangTessEvaluation: case EShLangTessEvaluation:
case EShLangGeometry: case EShLangGeometry:
// TODO: desktop functionality: support new stages // TODO: desktop functionality: support new stages: note it is probably best to stop adding/using special qualifiers, given the passthrough nature of these stages
break; break;
case EShLangFragment: case EShLangFragment:
symbolTable.insert(*new TVariable(NewPoolTString("gl_FrontFacing"), TType(EbtBool, EvqFace, 1))); SpecialQualifier("gl_FrontFacing", EvqFace, symbolTable);
SpecialQualifier("gl_FragCoord", EvqFragCoord, symbolTable);
if (profile == EEsProfile) SpecialQualifier("gl_PointCoord", EvqPointCoord, symbolTable);
pq = version == 100 ? EpqMedium : EpqHigh; SpecialQualifier("gl_FragColor", EvqFragColor, symbolTable);
else SpecialQualifier("gl_FragDepth", EvqFragDepth, symbolTable);
pq = EpqNone;
symbolTable.insert(*new TVariable(NewPoolTString("gl_FragCoord"), TType(EbtFloat, EvqFragCoord, pq, 4)));
if (profile == EEsProfile || version >= 120) {
pq = profile == EEsProfile ? EpqMedium : EpqNone;
symbolTable.insert(*new TVariable(NewPoolTString("gl_PointCoord"), TType(EbtFloat, EvqPointCoord, pq, 2)));
}
if (version < FirstProfileVersion || profile == ECompatibilityProfile || (! ForwardCompatibility && profile != EEsProfile && version < 420)) {
pq = profile == EEsProfile ? EpqMedium : EpqNone;
symbolTable.insert(*new TVariable(NewPoolTString("gl_FragColor"), TType(EbtFloat, EvqFragColor, pq, 4)));
}
if (profile != EEsProfile || version > 100) {
pq = profile == EEsProfile ? EpqHigh : EpqNone;
symbolTable.insert(*new TVariable(NewPoolTString("gl_FragDepth"), TType(EbtFloat, EvqFragDepth, pq, 1)));
}
break; break;
case EShLangCompute: case EShLangCompute:
...@@ -1689,7 +2055,7 @@ void IdentifyBuiltIns(int version, EProfile profile, EShLanguage language, TSymb ...@@ -1689,7 +2055,7 @@ void IdentifyBuiltIns(int version, EProfile profile, EShLanguage language, TSymb
case EShLangFragment: case EShLangFragment:
// Set up gl_FragData based on current array size. // Set up gl_FragData based on current array size.
if (version < FirstProfileVersion || profile == ECompatibilityProfile || (! ForwardCompatibility && profile != EEsProfile && version < 420)) { if (version == 100 || IncludeLegacy(version, profile) || (! ForwardCompatibility && profile != EEsProfile && version < 420)) {
TPrecisionQualifier pq = profile == EEsProfile ? EpqMedium : EpqNone; TPrecisionQualifier pq = profile == EEsProfile ? EpqMedium : EpqNone;
TType fragData(EbtFloat, EvqFragColor, pq, 4); TType fragData(EbtFloat, EvqFragColor, pq, 4);
TArraySizes* arraySizes = new TArraySizes; TArraySizes* arraySizes = new TArraySizes;
......
glslang/MachineIndependent/ParseHelper.cpp
...@@ -1484,20 +1484,17 @@ void TParseContext::globalQualifierCheck(TSourceLoc loc, const TQualifier& quali ...@@ -1484,20 +1484,17 @@ void TParseContext::globalQualifierCheck(TSourceLoc loc, const TQualifier& quali
if (publicType.basicType == EbtInt || publicType.basicType == EbtUint || publicType.basicType == EbtDouble) { if (publicType.basicType == EbtInt || publicType.basicType == EbtUint || publicType.basicType == EbtDouble) {
profileRequires(loc, EEsProfile, 300, 0, "shader input/output"); profileRequires(loc, EEsProfile, 300, 0, "shader input/output");
if ((language != EShLangVertex && qualifier.storage == EvqVaryingIn && ! qualifier.flat) || if (! qualifier.flat) {
(language != EShLangFragment && qualifier.storage == EvqVaryingOut && ! qualifier.flat)) { if (qualifier.storage == EvqVaryingIn && language == EShLangFragment)
error(loc, "must be qualified as 'flat'", GetStorageQualifierString(qualifier.storage), TType::getBasicString(publicType.basicType)); error(loc, "must be qualified as flat", TType::getBasicString(publicType.basicType), GetStorageQualifierString(qualifier.storage));
else if (qualifier.storage == EvqVaryingOut && language == EShLangVertex && version == 300)
return; error(loc, "must be qualified as flat", TType::getBasicString(publicType.basicType), GetStorageQualifierString(qualifier.storage));
} }
} }
if (language == EShLangVertex && qualifier.storage == EvqVaryingIn && if (language == EShLangVertex && qualifier.storage == EvqVaryingIn &&
(qualifier.isAuxiliary() || qualifier.isInterpolation() || qualifier.isMemory() || qualifier.invariant)) { (qualifier.isAuxiliary() || qualifier.isInterpolation() || qualifier.isMemory() || qualifier.invariant))
error(loc, "vertex input cannot be further qualified", "", ""); error(loc, "vertex input cannot be further qualified", "", "");
return;
}
} }
// //
...@@ -1883,7 +1880,7 @@ TSymbol* TParseContext::redeclareBuiltin(TSourceLoc loc, const TString& identifi ...@@ -1883,7 +1880,7 @@ TSymbol* TParseContext::redeclareBuiltin(TSourceLoc loc, const TString& identifi
if (builtIn) { if (builtIn) {
// Copy the symbol up to make a writable version // Copy the symbol up to make a writable version
newDeclaration = true; newDeclaration = true;
symbol = symbolTable.copyUp(symbol)->getAsVariable(); symbol = symbolTable.copyUp(symbol);
} }
// Now, modify the type of the copy, as per the type of the current redeclaration. // Now, modify the type of the copy, as per the type of the current redeclaration.
...@@ -2573,16 +2570,33 @@ void TParseContext::addBlock(TSourceLoc loc, TTypeList& typeList, const TString* ...@@ -2573,16 +2570,33 @@ void TParseContext::addBlock(TSourceLoc loc, TTypeList& typeList, const TString*
if (arraySizes) if (arraySizes)
blockType.setArraySizes(arraySizes); blockType.setArraySizes(arraySizes);
blockType.getQualifier().layoutPacking = defaultQualification.layoutPacking; blockType.getQualifier().layoutPacking = defaultQualification.layoutPacking;
TVariable* userTypeDef = new TVariable(blockName, blockType, true);
if (! symbolTable.insert(*userTypeDef)) { //
error(loc, "redefinition", blockName->c_str(), "block name"); // Don't make a user-defined type out of block name; that will cause an error
// if the same block name gets reused in a different interface.
//
// "Block names have no other use within a shader
// beyond interface matching; it is a compile-time error to use a block name at global scope for anything
// other than as a block name (e.g., use of a block name for a global variable name or function name is
// currently reserved)."
//
// Use the symbol table to prevent normal reuse of the block's name, as a variable entry,
// whose type is EbtBlock, but without all the structure; that will come from the type
// the instances point to.
//
TType blockNameType(EbtBlock);
TVariable* blockNameVar = new TVariable(blockName, blockNameType);
if (! symbolTable.insert(*blockNameVar)) {
TSymbol* existingName = symbolTable.find(*blockName);
if (existingName->getType().getBasicType() != EbtBlock) {
error(loc, "block name cannot redefine a non-block name", blockName->c_str(), "");
return; return;
} }
}
// Add the variable, as anonymous or named instanceName // Add the variable, as anonymous or named instanceName.
// Make an anonymous variable if no name was provided.
// make an anonymous variable if no name was provided
if (! instanceName) if (! instanceName)
instanceName = NewPoolTString(""); instanceName = NewPoolTString("");
...@@ -2596,7 +2610,7 @@ void TParseContext::addBlock(TSourceLoc loc, TTypeList& typeList, const TString* ...@@ -2596,7 +2610,7 @@ void TParseContext::addBlock(TSourceLoc loc, TTypeList& typeList, const TString*
return; return;
} }
// save it in case there are no references in the AST, so the linker can error test against it // Save it in the AST for linker use.
intermediate.addSymbolLinkageNode(linkage, *variable); intermediate.addSymbolLinkageNode(linkage, *variable);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment