Track which extensions were enabled or required, in the intermediate representation...

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@26155 e7fa87d3-cd2b-0410-9028-fcbf551c1848

diff --git a/Test/baseResults/100.frag.out b/Test/baseResults/100.frag.out
index cc06792..703c629 100644 (file)
--- a/Test/baseResults/100.frag.out
+++ b/Test/baseResults/100.frag.out
@@ -71,6 +71,12 @@ ERROR: 0:181: '' :  syntax error
 ERROR: 62 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 100\r
+Requested GL_EXT_frag_depth\r
+Requested GL_EXT_shader_texture_lod\r
+Requested GL_OES_EGL_image_external\r
+Requested GL_OES_standard_derivatives\r
+Requested GL_OES_texture_3D\r
 ERROR: node is still EOpNull!\r
 0:3  Sequence\r
 0:3    move second child to first child (3-element array of mediump int)\r
@@ -349,4 +355,10 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 100\r
+Requested GL_EXT_frag_depth\r
+Requested GL_EXT_shader_texture_lod\r
+Requested GL_OES_EGL_image_external\r
+Requested GL_OES_standard_derivatives\r
+Requested GL_OES_texture_3D\r
 \r

diff --git a/Test/baseResults/100Limits.vert.out b/Test/baseResults/100Limits.vert.out
index e561fcc..2c02af1 100644 (file)
--- a/Test/baseResults/100Limits.vert.out
+++ b/Test/baseResults/100Limits.vert.out
@@ -1,5 +1,6 @@
 100Limits.vert\r
 \r
+Shader version: 100\r
 0:? Sequence\r
 0:15  Function Definition: foo(f1; (void)\r
 0:15    Function Parameters: \r
@@ -445,4 +446,5 @@
 Linked vertex stage:\r
 \r
 \r
+Shader version: 100\r
 \r

diff --git a/Test/baseResults/100scope.vert.out b/Test/baseResults/100scope.vert.out
index edf9cd3..dcdc1d9 100644 (file)
--- a/Test/baseResults/100scope.vert.out
+++ b/Test/baseResults/100scope.vert.out
@@ -14,6 +14,7 @@ ERROR: 0:76: 'vertex-shader struct output' : not supported for this version or t
 ERROR: 12 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 100\r
 ERROR: node is still EOpNull!\r
 0:3  Function Definition: f(i1;i1;i1; (highp int)\r
 0:3    Function Parameters: \r
@@ -126,4 +127,5 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 100\r
 \r

diff --git a/Test/baseResults/110scope.vert.out b/Test/baseResults/110scope.vert.out
index 26b2e40..3397154 100644 (file)
--- a/Test/baseResults/110scope.vert.out
+++ b/Test/baseResults/110scope.vert.out
@@ -5,6 +5,7 @@ ERROR: 0:57: 'z' : redefinition
 ERROR: 3 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 110\r
 ERROR: node is still EOpNull!\r
 0:3  Function Definition: f(i1;i1;i1; (int)\r
 0:3    Function Parameters: \r
@@ -119,4 +120,5 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 110\r
 \r

diff --git a/Test/baseResults/120.frag.out b/Test/baseResults/120.frag.out
index 898015d..4c2dde9 100644 (file)
--- a/Test/baseResults/120.frag.out
+++ b/Test/baseResults/120.frag.out
@@ -37,6 +37,7 @@ ERROR: 0:153: '=' :  cannot convert from 'const float' to '3X4 matrix of float'
 ERROR: 35 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 120\r
 ERROR: node is still EOpNull!\r
 0:21  Function Definition: main( (void)\r
 0:21    Function Parameters: \r
@@ -395,4 +396,5 @@ Linked fragment stage:
 ERROR: Linking fragment stage: Recursion detected:\r
     foo(f1; calling foo(f1;\r
 \r
+Shader version: 120\r
 \r

diff --git a/Test/baseResults/120.vert.out b/Test/baseResults/120.vert.out
index 663e594..61f152a 100644 (file)
--- a/Test/baseResults/120.vert.out
+++ b/Test/baseResults/120.vert.out
@@ -48,6 +48,7 @@ ERROR: 0:121: 'gl_TexCoord array size' : must be less than gl_MaxTextureCoords (
 ERROR: 46 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 120\r
 ERROR: node is still EOpNull!\r
 0:15  Function Definition: main( (void)\r
 0:15    Function Parameters: \r
@@ -298,4 +299,5 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 120\r
 \r

diff --git a/Test/baseResults/130.frag.out b/Test/baseResults/130.frag.out
index 52be463..7cd6b0d 100644 (file)
--- a/Test/baseResults/130.frag.out
+++ b/Test/baseResults/130.frag.out
@@ -24,6 +24,12 @@ ERROR: 0:132: 'gl_MaxProgramTexelOffset' : undeclared identifier
 ERROR: 18 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 130\r
+Requested GL_ARB_gpu_shader5\r
+Requested GL_ARB_shading_language_420pack\r
+Requested GL_ARB_texture_cube_map_array\r
+Requested GL_ARB_texture_gather\r
+Requested GL_ARB_texture_rectangle\r
 ERROR: node is still EOpNull!\r
 0:16  Function Definition: main( (void)\r
 0:16    Function Parameters: \r
@@ -351,4 +357,10 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
+Requested GL_ARB_gpu_shader5\r
+Requested GL_ARB_shading_language_420pack\r
+Requested GL_ARB_texture_cube_map_array\r
+Requested GL_ARB_texture_gather\r
+Requested GL_ARB_texture_rectangle\r
 \r

diff --git a/Test/baseResults/140.frag.out b/Test/baseResults/140.frag.out
index 526c8b7..cd5f20b 100644 (file)
--- a/Test/baseResults/140.frag.out
+++ b/Test/baseResults/140.frag.out
@@ -10,6 +10,8 @@ ERROR: 0:32: 'out' : Non-L-value cannot be passed for 'out' or 'inout' parameter
 ERROR: 6 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 140\r
+Requested GL_ARB_separate_shader_objects\r
 ERROR: node is still EOpNull!\r
 0:10  Function Definition: main( (void)\r
 0:10    Function Parameters: \r
@@ -80,4 +82,6 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 140\r
+Requested GL_ARB_separate_shader_objects\r
 \r

diff --git a/Test/baseResults/150.frag.out b/Test/baseResults/150.frag.out
index 49ef968..be2205e 100644 (file)
--- a/Test/baseResults/150.frag.out
+++ b/Test/baseResults/150.frag.out
@@ -7,6 +7,7 @@ ERROR: 0:14: 'gl_FragCoord' : cannot redeclare after use
 ERROR: 4 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 150\r
 gl_FragCoord pixel center is integer\r
 gl_FragCoord origin is upper left\r
 ERROR: node is still EOpNull!\r
@@ -33,6 +34,7 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 150\r
 gl_FragCoord pixel center is integer\r
 gl_FragCoord origin is upper left\r
 \r

diff --git a/Test/baseResults/150.geom.out b/Test/baseResults/150.geom.out
index 30fd4ba..53ada90 100644 (file)
--- a/Test/baseResults/150.geom.out
+++ b/Test/baseResults/150.geom.out
@@ -34,6 +34,7 @@ ERROR: 0:91: 'stream' : can only be used on an output
 ERROR: 31 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 150\r
 invocations = 4\r
 max_vertices = 300\r
 input primitive = lines_adjancency\r
@@ -151,6 +152,7 @@ ERROR: node is still EOpNull!
 Linked geometry stage:\r
 \r
 \r
+Shader version: 150\r
 invocations = 4\r
 max_vertices = 300\r
 input primitive = lines_adjancency\r

diff --git a/Test/baseResults/150.tesc.out b/Test/baseResults/150.tesc.out
index 30646f9..378bd58 100644 (file)
--- a/Test/baseResults/150.tesc.out
+++ b/Test/baseResults/150.tesc.out
@@ -1,6 +1,8 @@
 150.tesc\r
 Warning, version 150 is not yet complete; some version-specific features are present, but many are missing.\r
 \r
+Shader version: 150\r
+Requested GL_ARB_tessellation_shader\r
 vertices = 4\r
 0:? Sequence\r
 0:10  Function Definition: main( (void)\r
@@ -112,6 +114,8 @@ ERROR: 0:12: 'barrier' : no matching overloaded function found
 ERROR: 1 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 150\r
+Requested GL_ARB_tessellation_shader\r
 input primitive = quads\r
 vertex spacing = fractional_odd_spacing\r
 triangle order = cw\r
@@ -226,6 +230,8 @@ ERROR: 0:60: 'location' : overlapping use of location 4
 ERROR: 11 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 400\r
+Requested GL_ARB_separate_shader_objects\r
 vertices = 4\r
 ERROR: node is still EOpNull!\r
 0:13  Function Definition: main( (void)\r
@@ -386,6 +392,8 @@ ERROR: 0:99: 'location' : overlapping use of location 24
 ERROR: 29 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 400\r
+Requested GL_ARB_separate_shader_objects\r
 input primitive = quads\r
 vertex spacing = fractional_odd_spacing\r
 triangle order = cw\r
@@ -509,6 +517,7 @@ ERROR: 0:4: 'length' :  array must first be sized by a redeclaration or layout q
 ERROR: 1 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 400\r
 vertices = 0\r
 ERROR: node is still EOpNull!\r
 0:8  Function Definition: main( (void)\r
@@ -528,6 +537,8 @@ ERROR: 0:29: 'out' : type must be an array: outf
 ERROR: 6 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 400\r
+Requested GL_ARB_separate_shader_objects\r
 vertices = 4\r
 ERROR: node is still EOpNull!\r
 0:15  Function Definition: main( (void)\r
@@ -616,6 +627,7 @@ ERROR: 0:58: 'initializer list' : wrong number of structure members
 ERROR: 13 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 420\r
 input primitive = none\r
 vertex spacing = none\r
 triangle order = none\r
@@ -793,6 +805,9 @@ ERROR: Linking tessellation evaluation stage: Multiple function bodies in multip
 ERROR: Linking tessellation evaluation stage: Multiple function bodies in multiple compilation units for the same signature in the same stage:\r
     main(\r
 \r
+Shader version: 400\r
+Requested GL_ARB_separate_shader_objects\r
+Requested GL_ARB_tessellation_shader\r
 vertices = 4\r
 0:? Sequence\r
 0:10  Function Definition: main( (void)\r
@@ -1083,6 +1098,9 @@ vertices = 4
 0:?     'outb' (out 5-element array of int)\r
 0:?     'outc' (out 4-element array of int)\r
 0:?     'outf' (out float)\r
+Shader version: 420\r
+Requested GL_ARB_separate_shader_objects\r
+Requested GL_ARB_tessellation_shader\r
 input primitive = quads\r
 vertex spacing = fractional_odd_spacing\r
 triangle order = cw\r

diff --git a/Test/baseResults/150.vert.out b/Test/baseResults/150.vert.out
index 62f7750..2cbc9c6 100644 (file)
--- a/Test/baseResults/150.vert.out
+++ b/Test/baseResults/150.vert.out
@@ -4,6 +4,7 @@ ERROR: 0:22: 'a' : cannot redeclare a user-block member array
 ERROR: 1 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 150\r
 ERROR: node is still EOpNull!\r
 0:9  Function Definition: main( (void)\r
 0:9    Function Parameters: \r
@@ -50,4 +51,5 @@ Linked vertex stage:
 \r
 ERROR: Linking vertex stage: Can only use one of gl_ClipDistance or gl_ClipVertex (gl_ClipDistance is preferred)\r
 \r
+Shader version: 150\r
 \r

diff --git a/Test/baseResults/300.frag.out b/Test/baseResults/300.frag.out
index f9124a0..a08ecbd 100644 (file)
--- a/Test/baseResults/300.frag.out
+++ b/Test/baseResults/300.frag.out
@@ -39,6 +39,7 @@ ERROR: 0:150: '' :  syntax error
 ERROR: 37 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 300\r
 ERROR: node is still EOpNull!\r
 0:53  Function Definition: main( (void)\r
 0:53    Function Parameters: \r
@@ -392,4 +393,5 @@ Linked fragment stage:
 \r
 ERROR: Linking fragment stage: when more than one fragment shader output, all must have location qualifiers\r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/300.vert.out b/Test/baseResults/300.vert.out
index 3b2deac..bd3f26f 100644 (file)
--- a/Test/baseResults/300.vert.out
+++ b/Test/baseResults/300.vert.out
@@ -41,6 +41,7 @@ ERROR: 0:170: 'Bfoo' : cannot add storage, auxiliary, memory, interpolation, lay
 ERROR: 39 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 300\r
 ERROR: node is still EOpNull!\r
 0:27  Function Definition: main( (void)\r
 0:27    Function Parameters: \r
@@ -298,4 +299,5 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/300BuiltIns.frag.out b/Test/baseResults/300BuiltIns.frag.out
index 650d622..ab66467 100644 (file)
--- a/Test/baseResults/300BuiltIns.frag.out
+++ b/Test/baseResults/300BuiltIns.frag.out
@@ -4,6 +4,7 @@ ERROR: 0:70: 'noise2' : no matching overloaded function found
 ERROR: 2 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 300\r
 ERROR: node is still EOpNull!\r
 0:26  Function Definition: main( (void)\r
 0:26    Function Parameters: \r
@@ -210,4 +211,5 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/300block.frag.out b/Test/baseResults/300block.frag.out
index 98c3c2f..0b21bf7 100644 (file)
--- a/Test/baseResults/300block.frag.out
+++ b/Test/baseResults/300block.frag.out
@@ -6,6 +6,7 @@ ERROR: 0:45: 'variable indexing block array' : not supported with this profile:
 ERROR: 4 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 300\r
 ERROR: node is still EOpNull!\r
 0:42  Function Definition: main( (void)\r
 0:42    Function Parameters: \r
@@ -60,4 +61,5 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/300layout.frag.out b/Test/baseResults/300layout.frag.out
index 0c952e4..11674a8 100644 (file)
--- a/Test/baseResults/300layout.frag.out
+++ b/Test/baseResults/300layout.frag.out
@@ -5,6 +5,7 @@ ERROR: 0:19: 'location' : overlapping use of location 40
 ERROR: 3 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 300\r
 ERROR: node is still EOpNull!\r
 0:10  Function Definition: main( (void)\r
 0:10    Function Parameters: \r
@@ -35,4 +36,5 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/300layout.vert.out b/Test/baseResults/300layout.vert.out
index 4d2c3a5..302d41d 100644 (file)
--- a/Test/baseResults/300layout.vert.out
+++ b/Test/baseResults/300layout.vert.out
@@ -20,6 +20,7 @@ ERROR: 0:57: 'location' : overlapping use of location 40
 ERROR: 18 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 300\r
 ERROR: node is still EOpNull!\r
 0:44  Function Definition: main( (void)\r
 0:44    Function Parameters: \r
@@ -83,4 +84,5 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/300link.frag.out b/Test/baseResults/300link.frag.out
index 7ce563a..e22cd8c 100644 (file)
--- a/Test/baseResults/300link.frag.out
+++ b/Test/baseResults/300link.frag.out
@@ -1,5 +1,6 @@
 300link.frag\r
 \r
+Shader version: 300\r
 0:? Sequence\r
 0:8  Function Definition: main( (void)\r
 0:8    Function Parameters: \r
@@ -12,4 +13,5 @@ Linked fragment stage:
 \r
 ERROR: Linking fragment stage: when more than one fragment shader output, all must have location qualifiers\r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/300link2.frag.out b/Test/baseResults/300link2.frag.out
index bf264ec..7146bd1 100644 (file)
--- a/Test/baseResults/300link2.frag.out
+++ b/Test/baseResults/300link2.frag.out
@@ -1,5 +1,6 @@
 300link2.frag\r
 \r
+Shader version: 300\r
 0:? Sequence\r
 0:9  Function Definition: main( (void)\r
 0:9    Function Parameters: \r
@@ -13,4 +14,5 @@
 Linked fragment stage:\r
 \r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/300link3.frag.out b/Test/baseResults/300link3.frag.out
index 1317a2d..8cb4c76 100644 (file)
--- a/Test/baseResults/300link3.frag.out
+++ b/Test/baseResults/300link3.frag.out
@@ -1,5 +1,6 @@
 300link3.frag\r
 \r
+Shader version: 300\r
 0:? Sequence\r
 0:7  Function Definition: main( (void)\r
 0:7    Function Parameters: \r
@@ -10,4 +11,5 @@
 Linked fragment stage:\r
 \r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/300operations.frag.out b/Test/baseResults/300operations.frag.out
index a4f8d37..45995bd 100644 (file)
--- a/Test/baseResults/300operations.frag.out
+++ b/Test/baseResults/300operations.frag.out
@@ -58,6 +58,7 @@ ERROR: 0:90: 'assign' :  l-value required
 ERROR: 56 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 300\r
 ERROR: node is still EOpNull!\r
 0:13  Function Definition: main( (void)\r
 0:13    Function Parameters: \r
@@ -239,4 +240,5 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/300scope.vert.out b/Test/baseResults/300scope.vert.out
index cde7d23..3dc931b 100644 (file)
--- a/Test/baseResults/300scope.vert.out
+++ b/Test/baseResults/300scope.vert.out
@@ -21,6 +21,7 @@ ERROR: 0:73: 'degrees' : can't use function syntax on variable
 ERROR: 19 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 300\r
 ERROR: node is still EOpNull!\r
 0:3  Function Definition: f(i1;i1;i1; (highp int)\r
 0:3    Function Parameters: \r
@@ -133,4 +134,5 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/330.frag.out b/Test/baseResults/330.frag.out
index 9775500..f70d28e 100644 (file)
--- a/Test/baseResults/330.frag.out
+++ b/Test/baseResults/330.frag.out
@@ -30,6 +30,9 @@ ERROR: 0:119: 'location' : overlapping use of location 44
 ERROR: 27 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 330\r
+Requested GL_ARB_enhanced_layouts\r
+Requested GL_ARB_separate_shader_objects\r
 ERROR: node is still EOpNull!\r
 0:8  Function Definition: main( (void)\r
 0:8    Function Parameters: \r
@@ -95,4 +98,7 @@ Linked fragment stage:
 ERROR: Linking fragment stage: Cannot use gl_FragColor or gl_FragData when using user-defined outputs\r
 ERROR: Linking fragment stage: Cannot use both gl_FragColor and gl_FragData\r
 \r
+Shader version: 330\r
+Requested GL_ARB_enhanced_layouts\r
+Requested GL_ARB_separate_shader_objects\r
 \r

diff --git a/Test/baseResults/330comp.frag.out b/Test/baseResults/330comp.frag.out
index 3e8852f..3a2aae8 100644 (file)
--- a/Test/baseResults/330comp.frag.out
+++ b/Test/baseResults/330comp.frag.out
@@ -1,6 +1,7 @@
 330comp.frag\r
 Warning, version 330 is not yet complete; some version-specific features are present, but many are missing.\r
 \r
+Shader version: 330\r
 0:? Sequence\r
 0:8  Function Definition: main( (void)\r
 0:8    Function Parameters: \r
@@ -26,4 +27,5 @@ Linked fragment stage:
 \r
 ERROR: Linking fragment stage: Cannot use both gl_FragColor and gl_FragData\r
 \r
+Shader version: 330\r
 \r

diff --git a/Test/baseResults/400.frag.out b/Test/baseResults/400.frag.out
index 6e2de57..0f7f26f 100644 (file)
--- a/Test/baseResults/400.frag.out
+++ b/Test/baseResults/400.frag.out
@@ -18,6 +18,8 @@ ERROR: 0:58: 'patch' : not supported in this stage: fragment
 ERROR: 15 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 400\r
+Requested GL_ARB_separate_shader_objects\r
 gl_FragCoord pixel center is integer\r
 gl_FragCoord origin is upper left\r
 ERROR: node is still EOpNull!\r
@@ -238,6 +240,8 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 400\r
+Requested GL_ARB_separate_shader_objects\r
 gl_FragCoord pixel center is integer\r
 gl_FragCoord origin is upper left\r
 \r

diff --git a/Test/baseResults/400.geom.out b/Test/baseResults/400.geom.out
index 163ebfd..bc16de2 100644 (file)
--- a/Test/baseResults/400.geom.out
+++ b/Test/baseResults/400.geom.out
@@ -21,6 +21,8 @@ ERROR: 0:71: 'triangles' : inconsistent input primitive for array size of inbla
 ERROR: 18 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 400\r
+Requested GL_ARB_separate_shader_objects\r
 invocations = 4\r
 max_vertices = 127\r
 input primitive = triangles\r
@@ -93,6 +95,8 @@ Linked geometry stage:
 \r
 ERROR: Linking geometry stage: At least one shader must specify an output layout primitive\r
 \r
+Shader version: 400\r
+Requested GL_ARB_separate_shader_objects\r
 invocations = 4\r
 max_vertices = 127\r
 input primitive = triangles\r

diff --git a/Test/baseResults/410.geom.out b/Test/baseResults/410.geom.out
index e67c8f2..2e5c069 100644 (file)
--- a/Test/baseResults/410.geom.out
+++ b/Test/baseResults/410.geom.out
@@ -10,6 +10,7 @@ ERROR: 0:33: 'assign' :  cannot convert from 'const 4-component vector of float'
 ERROR: 7 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 410\r
 invocations = 0\r
 max_vertices = 0\r
 input primitive = none\r
@@ -56,6 +57,7 @@ ERROR: Linking geometry stage: At least one shader must specify an input layout
 ERROR: Linking geometry stage: At least one shader must specify an output layout primitive\r
 ERROR: Linking geometry stage: At least one shader must specify a layout(max_vertices = value)\r
 \r
+Shader version: 410\r
 invocations = 0\r
 max_vertices = 0\r
 input primitive = none\r

diff --git a/Test/baseResults/420.geom.out b/Test/baseResults/420.geom.out
index e374160..844791d 100644 (file)
--- a/Test/baseResults/420.geom.out
+++ b/Test/baseResults/420.geom.out
@@ -9,6 +9,7 @@ ERROR: 0:49: 'gl_ClipDistance' : cannot change arrayness of redeclared block mem
 ERROR: 6 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 420\r
 invocations = 0\r
 max_vertices = 0\r
 input primitive = triangles\r
@@ -129,6 +130,7 @@ ERROR: Linking geometry stage: Missing entry point: Each stage requires one "voi
 ERROR: Linking geometry stage: At least one shader must specify an output layout primitive\r
 ERROR: Linking geometry stage: At least one shader must specify a layout(max_vertices = value)\r
 \r
+Shader version: 420\r
 invocations = 0\r
 max_vertices = 0\r
 input primitive = triangles\r

diff --git a/Test/baseResults/420.vert.out b/Test/baseResults/420.vert.out
index 8b8e323..c7d6ddb 100644 (file)
--- a/Test/baseResults/420.vert.out
+++ b/Test/baseResults/420.vert.out
@@ -34,6 +34,7 @@ ERROR: 0:86: 'patch' : not supported in this stage: vertex
 ERROR: 30 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 420\r
 ERROR: node is still EOpNull!\r
 0:20  Function Definition: foo( (const int)\r
 0:20    Function Parameters: \r
@@ -143,4 +144,5 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 420\r
 \r

diff --git a/Test/baseResults/420_size_gl_in.geom.out b/Test/baseResults/420_size_gl_in.geom.out
index aa5a866..4482d92 100644 (file)
--- a/Test/baseResults/420_size_gl_in.geom.out
+++ b/Test/baseResults/420_size_gl_in.geom.out
@@ -4,6 +4,7 @@ ERROR: 0:19: 'gl_PerVertex' : can only redeclare a built-in block once, and befo
 ERROR: 1 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 420\r
 invocations = 0\r
 max_vertices = 0\r
 input primitive = triangles\r
@@ -42,6 +43,7 @@ ERROR: Linking geometry stage: Missing entry point: Each stage requires one "voi
 ERROR: Linking geometry stage: At least one shader must specify an output layout primitive\r
 ERROR: Linking geometry stage: At least one shader must specify a layout(max_vertices = value)\r
 \r
+Shader version: 420\r
 invocations = 0\r
 max_vertices = 0\r
 input primitive = triangles\r

diff --git a/Test/baseResults/430.comp.out b/Test/baseResults/430.comp.out
index fc4f4ed..2621bf9 100644 (file)
--- a/Test/baseResults/430.comp.out
+++ b/Test/baseResults/430.comp.out
@@ -4,6 +4,7 @@ ERROR: 0:12: 'location qualifier on input' : not supported in this stage: comput
 ERROR: 1 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 430\r
 ERROR: node is still EOpNull!\r
 0:3  Function Definition: main( (void)\r
 0:3    Function Parameters: \r
@@ -20,4 +21,5 @@ ERROR: node is still EOpNull!
 Linked compute stage:\r
 \r
 \r
+Shader version: 430\r
 \r

diff --git a/Test/baseResults/430.vert.out b/Test/baseResults/430.vert.out
index 8c5ad3b..7c40c96 100644 (file)
--- a/Test/baseResults/430.vert.out
+++ b/Test/baseResults/430.vert.out
@@ -47,6 +47,8 @@ ERROR: 0:93: 'transform feedback qualifier' : not supported for this version or
 ERROR: 44 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 430\r
+Requested GL_ARB_enhanced_layouts\r
 in xfb mode\r
 ERROR: node is still EOpNull!\r
 0:14  Function Definition: foo( (void)\r
@@ -117,5 +119,7 @@ ERROR: Linking vertex stage: Missing entry point: Each stage requires one "void
 ERROR: Linking vertex stage: xfb_stride is too small to hold all buffer entries:\r
 ERROR:     xfb_buffer 3, xfb_stride 64, minimum stride needed: 80\r
 \r
+Shader version: 430\r
+Requested GL_ARB_enhanced_layouts\r
 in xfb mode\r
 \r

diff --git a/Test/baseResults/430scope.vert.out b/Test/baseResults/430scope.vert.out
index 8bfdb10..a2d1230 100644 (file)
--- a/Test/baseResults/430scope.vert.out
+++ b/Test/baseResults/430scope.vert.out
@@ -11,6 +11,7 @@ ERROR: 0:73: 'degrees' : can't use function syntax on variable
 ERROR: 8 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 430\r
 ERROR: node is still EOpNull!\r
 0:3  Function Definition: f(i1;i1;i1; (int)\r
 0:3    Function Parameters: \r
@@ -127,4 +128,5 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 430\r
 \r

diff --git a/Test/baseResults/440.frag.out b/Test/baseResults/440.frag.out
index 0da5c06..158871b 100644 (file)
--- a/Test/baseResults/440.frag.out
+++ b/Test/baseResults/440.frag.out
@@ -48,6 +48,7 @@ ERROR: 0:104: 'offset' : must be a multiple of the member's alignment
 ERROR: 45 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 440\r
 ERROR: node is still EOpNull!\r
 0:?   Linker Objects\r
 0:?     'a' (layout(location=4 component=2 ) smooth in 2-component vector of float)\r
@@ -90,4 +91,5 @@ Linked fragment stage:
 \r
 ERROR: Linking fragment stage: Missing entry point: Each stage requires one "void main()" entry point\r
 \r
+Shader version: 440\r
 \r

diff --git a/Test/baseResults/440.vert.out b/Test/baseResults/440.vert.out
index c385efa..3d3f582 100644 (file)
--- a/Test/baseResults/440.vert.out
+++ b/Test/baseResults/440.vert.out
@@ -45,6 +45,7 @@ ERROR: 0:157: 'xfb_buffer' : buffer is too large: gl_MaxTransformFeedbackBuffers
 ERROR: 42 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 440\r
 in xfb mode\r
 ERROR: node is still EOpNull!\r
 0:?   Linker Objects\r
@@ -112,5 +113,6 @@ ERROR:     xfb_buffer 5, xfb_stride 6
 ERROR: Linking vertex stage: xfb_stride is too large:\r
 ERROR:     xfb_buffer 7, components (1/4 stride) needed are 66, gl_MaxTransformFeedbackInterleavedComponents is 64\r
 \r
+Shader version: 440\r
 in xfb mode\r
 \r

diff --git a/Test/baseResults/Operations.frag.out b/Test/baseResults/Operations.frag.out
index e764d49..e0834bd 100644 (file)
--- a/Test/baseResults/Operations.frag.out
+++ b/Test/baseResults/Operations.frag.out
@@ -1,6 +1,7 @@
 ../../LunarGLASS/test/Operations.frag\r
 Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:15  Function Definition: main( (void)\r
 0:15    Function Parameters: \r
@@ -437,4 +438,5 @@ Warning, version 130 is not yet complete; most features are present, but a few a
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/aggOps.frag.out b/Test/baseResults/aggOps.frag.out
index 57b402f..b3916c6 100644 (file)
--- a/Test/baseResults/aggOps.frag.out
+++ b/Test/baseResults/aggOps.frag.out
@@ -3,6 +3,7 @@ Warning, version 130 is not yet complete; most features are present, but a few a
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release\r
 WARNING: 0:6: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:23  Function Definition: main( (void)\r
 0:23    Function Parameters: \r
@@ -151,4 +152,5 @@ WARNING: 0:6: varying deprecated in version 130; may be removed in future releas
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/always-discard.frag.out b/Test/baseResults/always-discard.frag.out
index 99f2465..ba2c58e 100644 (file)
--- a/Test/baseResults/always-discard.frag.out
+++ b/Test/baseResults/always-discard.frag.out
@@ -1,5 +1,6 @@
 ../../LunarGLASS/test/always-discard.frag\r
 \r
+Shader version: 110\r
 0:? Sequence\r
 0:4  Function Definition: main( (void)\r
 0:4    Function Parameters: \r
@@ -120,4 +121,5 @@
 Linked fragment stage:\r
 \r
 \r
+Shader version: 110\r
 \r

diff --git a/Test/baseResults/always-discard2.frag.out b/Test/baseResults/always-discard2.frag.out
index fe9c9c3..199d1ae 100644 (file)
--- a/Test/baseResults/always-discard2.frag.out
+++ b/Test/baseResults/always-discard2.frag.out
@@ -1,5 +1,6 @@
 ../../LunarGLASS/test/always-discard2.frag\r
 \r
+Shader version: 110\r
 0:? Sequence\r
 0:4  Function Definition: main( (void)\r
 0:4    Function Parameters: \r
@@ -61,4 +62,5 @@
 Linked fragment stage:\r
 \r
 \r
+Shader version: 110\r
 \r

diff --git a/Test/baseResults/array.frag.out b/Test/baseResults/array.frag.out
index 8f5d6dc..e117e57 100644 (file)
--- a/Test/baseResults/array.frag.out
+++ b/Test/baseResults/array.frag.out
@@ -20,6 +20,7 @@ ERROR: 0:63: '' : array size required
 ERROR: 17 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 130\r
 ERROR: node is still EOpNull!\r
 0:9  Function Definition: foo(f1[5]; (4-element array of float)\r
 0:9    Function Parameters: \r
@@ -195,4 +196,5 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/array100.frag.out b/Test/baseResults/array100.frag.out
index 835332a..ba18ffc 100644 (file)
--- a/Test/baseResults/array100.frag.out
+++ b/Test/baseResults/array100.frag.out
@@ -24,6 +24,7 @@ ERROR: 0:69: 'array initializer' : not supported for this version or the enabled
 ERROR: 22 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 100\r
 ERROR: node is still EOpNull!\r
 0:9  Function Definition: foo(f1[5]; (4-element array of mediump float)\r
 0:9    Function Parameters: \r
@@ -160,4 +161,5 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 100\r
 \r

diff --git a/Test/baseResults/comment.frag.out b/Test/baseResults/comment.frag.out
index c3a548c..4a9247d 100644 (file)
--- a/Test/baseResults/comment.frag.out
+++ b/Test/baseResults/comment.frag.out
@@ -3,6 +3,7 @@ Warning, version 430 is not yet complete; some version-specific features are pre
 WARNING: 0:10: 'line continuation' : used at end of comment; the following line is still part of the comment \r
 WARNING: 0:12: 'line continuation' : used at end of comment; the following line is still part of the comment \r
 \r
+Shader version: 430\r
 0:? Sequence\r
 0:17  Function Definition: main( (void)\r
 0:17    Function Parameters: \r
@@ -13,4 +14,5 @@ WARNING: 0:12: 'line continuation' : used at end of comment; the following line
 Linked fragment stage:\r
 \r
 \r
+Shader version: 430\r
 \r

diff --git a/Test/baseResults/conditionalDiscard.frag.out b/Test/baseResults/conditionalDiscard.frag.out
index f3df2e7..0bdc74c 100644 (file)
--- a/Test/baseResults/conditionalDiscard.frag.out
+++ b/Test/baseResults/conditionalDiscard.frag.out
@@ -1,5 +1,6 @@
 ../../LunarGLASS/test/conditionalDiscard.frag\r
 \r
+Shader version: 110\r
 0:? Sequence\r
 0:6  Function Definition: main( (void)\r
 0:6    Function Parameters: \r
@@ -32,4 +33,5 @@
 Linked fragment stage:\r
 \r
 \r
+Shader version: 110\r
 \r

diff --git a/Test/baseResults/constErrors.frag.out b/Test/baseResults/constErrors.frag.out
index d62d4aa..de219e5 100644 (file)
--- a/Test/baseResults/constErrors.frag.out
+++ b/Test/baseResults/constErrors.frag.out
@@ -12,6 +12,7 @@ ERROR: 0:33: '=' : global const initializers must be constant 'const structure{3
 ERROR: 9 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 330\r
 ERROR: node is still EOpNull!\r
 0:10  Function Definition: main( (void)\r
 0:10    Function Parameters: \r
@@ -35,4 +36,5 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 330\r
 \r

diff --git a/Test/baseResults/constFold.frag.out b/Test/baseResults/constFold.frag.out
index 28306e0..84c2661 100644 (file)
--- a/Test/baseResults/constFold.frag.out
+++ b/Test/baseResults/constFold.frag.out
@@ -9,6 +9,7 @@ ERROR: 0:114: '[' :  matrix index out of range '3'
 ERROR: 6 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 430\r
 ERROR: node is still EOpNull!\r
 0:28  Function Definition: main( (void)\r
 0:28    Function Parameters: \r
@@ -309,4 +310,5 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 430\r
 \r

diff --git a/Test/baseResults/conversion.frag.out b/Test/baseResults/conversion.frag.out
index b6f480a..f2a4291 100644 (file)
--- a/Test/baseResults/conversion.frag.out
+++ b/Test/baseResults/conversion.frag.out
@@ -1,6 +1,7 @@
 ../../LunarGLASS/test/conversion.frag\r
 Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:33  Function Definition: main( (void)\r
 0:33    Function Parameters: \r
@@ -479,4 +480,5 @@ Warning, version 130 is not yet complete; most features are present, but a few a
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/cppComplexExpr.vert.out b/Test/baseResults/cppComplexExpr.vert.out
index 4671f20..e72230e 100644 (file)
--- a/Test/baseResults/cppComplexExpr.vert.out
+++ b/Test/baseResults/cppComplexExpr.vert.out
@@ -37,6 +37,7 @@ ERROR: 0:10002: '' : missing #endif
 ERROR: 35 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 300\r
 ERROR: node is still EOpNull!\r
 0:4  Sequence\r
 0:4    move second child to first child (highp float)\r
@@ -112,4 +113,5 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/cppIndent.vert.out b/Test/baseResults/cppIndent.vert.out
index d2d43fb..3ac19ca 100644 (file)
--- a/Test/baseResults/cppIndent.vert.out
+++ b/Test/baseResults/cppIndent.vert.out
@@ -4,6 +4,7 @@ ERROR: 0:61: '' :  syntax error
 ERROR: 2 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 110\r
 ERROR: node is still EOpNull!\r
 0:5  Sequence\r
 0:5    move second child to first child (float)\r
@@ -44,4 +45,5 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 110\r
 \r

diff --git a/Test/baseResults/cppNest.vert.out b/Test/baseResults/cppNest.vert.out
index 3a1d035..d2b00ad 100644 (file)
--- a/Test/baseResults/cppNest.vert.out
+++ b/Test/baseResults/cppNest.vert.out
@@ -8,6 +8,7 @@ ERROR: 0:178: '' :  syntax error
 ERROR: 6 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 110\r
 ERROR: node is still EOpNull!\r
 0:5  Sequence\r
 0:5    move second child to first child (float)\r
@@ -75,4 +76,5 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 110\r
 \r

diff --git a/Test/baseResults/cppSimple.vert.out b/Test/baseResults/cppSimple.vert.out
index 640f251..1e08ea0 100644 (file)
--- a/Test/baseResults/cppSimple.vert.out
+++ b/Test/baseResults/cppSimple.vert.out
@@ -86,6 +86,7 @@ ERROR: 12:10003: '' : missing #endif
 ERROR: 79 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 400\r
 ERROR: node is still EOpNull!\r
 0:5  Sequence\r
 0:5    move second child to first child (float)\r
@@ -196,4 +197,5 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 400\r
 \r

diff --git a/Test/baseResults/dataOut.frag.out b/Test/baseResults/dataOut.frag.out
index 311c10d..60cc7e2 100644 (file)
--- a/Test/baseResults/dataOut.frag.out
+++ b/Test/baseResults/dataOut.frag.out
@@ -2,6 +2,7 @@
 Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 WARNING: 0:3: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:5  Function Definition: main( (void)\r
 0:5    Function Parameters: \r
@@ -19,4 +20,5 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/dataOutIndirect.frag.out b/Test/baseResults/dataOutIndirect.frag.out
index 80c45cf..aa454d1 100644 (file)
--- a/Test/baseResults/dataOutIndirect.frag.out
+++ b/Test/baseResults/dataOutIndirect.frag.out
@@ -2,6 +2,7 @@
 Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 WARNING: 0:3: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:7  Function Definition: main( (void)\r
 0:7    Function Parameters: \r
@@ -19,4 +20,5 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/dce.frag.out b/Test/baseResults/dce.frag.out
index 0a86180..5756f3c 100644 (file)
--- a/Test/baseResults/dce.frag.out
+++ b/Test/baseResults/dce.frag.out
@@ -1,6 +1,7 @@
 dce.frag\r
 Warning, version 400 is not yet complete; some version-specific features are present, but many are missing.\r
 \r
+Shader version: 400\r
 0:? Sequence\r
 0:5  Sequence\r
 0:5    move second child to first child (int)\r
@@ -139,4 +140,5 @@ Linked fragment stage:
 \r
 ERROR: Linking fragment stage: Missing entry point: Each stage requires one "void main()" entry point\r
 \r
+Shader version: 400\r
 \r

diff --git a/Test/baseResults/decls.frag.out b/Test/baseResults/decls.frag.out
index 0a72ab7..eb3e6da 100644 (file)
--- a/Test/baseResults/decls.frag.out
+++ b/Test/baseResults/decls.frag.out
@@ -27,6 +27,7 @@ WARNING: 0:49: 'foob__vp' : identifiers containing consecutive underscores ("__"
 ERROR: 18 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 120\r
 ERROR: node is still EOpNull!\r
 0:5  Sequence\r
 0:5    move second child to first child (int)\r
@@ -271,4 +272,5 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 120\r
 \r

diff --git a/Test/baseResults/deepRvalue.frag.out b/Test/baseResults/deepRvalue.frag.out
index 0bbb5b2..d10c0bd 100644 (file)
--- a/Test/baseResults/deepRvalue.frag.out
+++ b/Test/baseResults/deepRvalue.frag.out
@@ -1,5 +1,6 @@
 ../../LunarGLASS/test/deepRvalue.frag\r
 \r
+Shader version: 120\r
 0:? Sequence\r
 0:5  Sequence\r
 0:5    move second child to first child (4-component vector of float)\r
@@ -143,4 +144,5 @@
 Linked fragment stage:\r
 \r
 \r
+Shader version: 120\r
 \r

diff --git a/Test/baseResults/depthOut.frag.out b/Test/baseResults/depthOut.frag.out
index 5e85845..7401c07 100644 (file)
--- a/Test/baseResults/depthOut.frag.out
+++ b/Test/baseResults/depthOut.frag.out
@@ -3,6 +3,7 @@ Warning, version 130 is not yet complete; most features are present, but a few a
 WARNING: 0:3: varying deprecated in version 130; may be removed in future release\r
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:6  Function Definition: main( (void)\r
 0:6    Function Parameters: \r
@@ -21,4 +22,5 @@ WARNING: 0:4: varying deprecated in version 130; may be removed in future releas
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/discard-dce.frag.out b/Test/baseResults/discard-dce.frag.out
index 35630f0..7329ca1 100644 (file)
--- a/Test/baseResults/discard-dce.frag.out
+++ b/Test/baseResults/discard-dce.frag.out
@@ -1,5 +1,6 @@
 ../../LunarGLASS/test/discard-dce.frag\r
 \r
+Shader version: 110\r
 0:? Sequence\r
 0:4  Function Definition: main( (void)\r
 0:4    Function Parameters: \r
@@ -120,4 +121,5 @@
 Linked fragment stage:\r
 \r
 \r
+Shader version: 110\r
 \r

diff --git a/Test/baseResults/doWhileLoop.frag.out b/Test/baseResults/doWhileLoop.frag.out
index 331c35b..fdb4237 100644 (file)
--- a/Test/baseResults/doWhileLoop.frag.out
+++ b/Test/baseResults/doWhileLoop.frag.out
@@ -1,5 +1,6 @@
 ../../LunarGLASS/test/doWhileLoop.frag\r
 \r
+Shader version: 110\r
 0:? Sequence\r
 0:7  Function Definition: main( (void)\r
 0:7    Function Parameters: \r
@@ -33,4 +34,5 @@
 Linked fragment stage:\r
 \r
 \r
+Shader version: 110\r
 \r

diff --git a/Test/baseResults/earlyReturnDiscard.frag.out b/Test/baseResults/earlyReturnDiscard.frag.out
index c712fbb..c7e8a81 100644 (file)
--- a/Test/baseResults/earlyReturnDiscard.frag.out
+++ b/Test/baseResults/earlyReturnDiscard.frag.out
@@ -1,5 +1,6 @@
 ../../LunarGLASS/test/earlyReturnDiscard.frag\r
 \r
+Shader version: 110\r
 0:? Sequence\r
 0:19  Function Definition: main( (void)\r
 0:19    Function Parameters: \r
@@ -129,4 +130,5 @@
 Linked fragment stage:\r
 \r
 \r
+Shader version: 110\r
 \r

diff --git a/Test/baseResults/empty.frag.out b/Test/baseResults/empty.frag.out
index 683b29d..d431ff9 100644 (file)
--- a/Test/baseResults/empty.frag.out
+++ b/Test/baseResults/empty.frag.out
@@ -1,15 +1,18 @@
 empty.frag\r
 \r
+Shader version: 100\r
 0:? Sequence\r
 0:?   Linker Objects\r
 \r
 empty2.frag\r
 \r
+Shader version: 100\r
 0:? Sequence\r
 0:?   Linker Objects\r
 \r
 empty3.frag\r
 \r
+Shader version: 110\r
 0:? Sequence\r
 0:?   Linker Objects\r
 \r
@@ -22,6 +25,7 @@ ERROR: Linking fragment stage: Cannot mix ES profile with non-ES profile shaders
 \r
 ERROR: Linking fragment stage: Missing entry point: Each stage requires one "void main()" entry point\r
 \r
+Shader version: 110\r
 0:? Sequence\r
 0:?   Linker Objects\r
 \r

diff --git a/Test/baseResults/errors.frag.out b/Test/baseResults/errors.frag.out
index dbf6300..215f235 100644 (file)
--- a/Test/baseResults/errors.frag.out
+++ b/Test/baseResults/errors.frag.out
@@ -4,6 +4,7 @@ ERROR: 0:1: 'int' :  main function cannot return a value
 ERROR: 2 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 100\r
 ERROR: node is still EOpNull!\r
 0:1  Function Definition: main(i1; (mediump int)\r
 0:1    Function Parameters: \r
@@ -18,4 +19,5 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 100\r
 \r

diff --git a/Test/baseResults/flowControl.frag.out b/Test/baseResults/flowControl.frag.out
index 3755e8d..cf1c016 100644 (file)
--- a/Test/baseResults/flowControl.frag.out
+++ b/Test/baseResults/flowControl.frag.out
@@ -1,5 +1,6 @@
 ../../LunarGLASS/test/flowControl.frag\r
 \r
+Shader version: 120\r
 0:? Sequence\r
 0:10  Function Definition: main( (void)\r
 0:10    Function Parameters: \r
@@ -41,4 +42,5 @@
 Linked fragment stage:\r
 \r
 \r
+Shader version: 120\r
 \r

diff --git a/Test/baseResults/forLoop.frag.out b/Test/baseResults/forLoop.frag.out
index 08f3174..dbb1bdb 100644 (file)
--- a/Test/baseResults/forLoop.frag.out
+++ b/Test/baseResults/forLoop.frag.out
@@ -1,5 +1,6 @@
 ../../LunarGLASS/test/forLoop.frag\r
 \r
+Shader version: 120\r
 0:? Sequence\r
 0:8  Function Definition: main( (void)\r
 0:8    Function Parameters: \r
@@ -39,4 +40,5 @@
 Linked fragment stage:\r
 \r
 \r
+Shader version: 120\r
 \r

diff --git a/Test/baseResults/forwardRef.frag.out b/Test/baseResults/forwardRef.frag.out
index 4769eb9..62140dc 100644 (file)
--- a/Test/baseResults/forwardRef.frag.out
+++ b/Test/baseResults/forwardRef.frag.out
@@ -1,5 +1,6 @@
 forwardRef.frag\r
 \r
+Shader version: 110\r
 0:? Sequence\r
 0:11  Function Definition: main( (void)\r
 0:11    Function Parameters: \r
@@ -63,4 +64,5 @@ forwardRef.frag
 Linked fragment stage:\r
 \r
 \r
+Shader version: 110\r
 \r

diff --git a/Test/baseResults/functionCall.frag.out b/Test/baseResults/functionCall.frag.out
index 48f6a63..6362de1 100644 (file)
--- a/Test/baseResults/functionCall.frag.out
+++ b/Test/baseResults/functionCall.frag.out
@@ -2,6 +2,7 @@
 Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:7  Sequence\r
 0:7    move second child to first child (float)\r
@@ -93,4 +94,5 @@ WARNING: 0:4: varying deprecated in version 130; may be removed in future releas
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/functionSemantics.frag.out b/Test/baseResults/functionSemantics.frag.out
index 4780bf8..8285868 100644 (file)
--- a/Test/baseResults/functionSemantics.frag.out
+++ b/Test/baseResults/functionSemantics.frag.out
@@ -1,6 +1,7 @@
 ../../LunarGLASS/test/functionSemantics.frag\r
 Warning, version 400 is not yet complete; some version-specific features are present, but many are missing.\r
 \r
+Shader version: 400\r
 0:? Sequence\r
 0:5  Function Definition: foo(i1;i1;i1;i1;i1;i1; (int)\r
 0:5    Function Parameters: \r
@@ -193,4 +194,5 @@ Warning, version 400 is not yet complete; some version-specific features are pre
 Linked fragment stage:\r
 \r
 \r
+Shader version: 400\r
 \r

diff --git a/Test/baseResults/length.frag.out b/Test/baseResults/length.frag.out
index 6f1699b..218ca07 100644 (file)
--- a/Test/baseResults/length.frag.out
+++ b/Test/baseResults/length.frag.out
@@ -1,5 +1,6 @@
 ../../LunarGLASS/test/length.frag\r
 \r
+Shader version: 120\r
 0:? Sequence\r
 0:11  Function Definition: main( (void)\r
 0:11    Function Parameters: \r
@@ -31,4 +32,5 @@
 Linked fragment stage:\r
 \r
 \r
+Shader version: 120\r
 \r

diff --git a/Test/baseResults/lineContinuation.vert.out b/Test/baseResults/lineContinuation.vert.out
index 87af5b4..ad3da79 100644 (file)
--- a/Test/baseResults/lineContinuation.vert.out
+++ b/Test/baseResults/lineContinuation.vert.out
@@ -23,6 +23,7 @@ ERROR: 0:150: '' :  syntax error
 ERROR: 19 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 300\r
 ERROR: node is still EOpNull!\r
 0:20  Function Definition: main( (void)\r
 0:20    Function Parameters: \r
@@ -188,4 +189,5 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/lineContinuation100.vert.out b/Test/baseResults/lineContinuation100.vert.out
index 642c2ae..4313aae 100644 (file)
--- a/Test/baseResults/lineContinuation100.vert.out
+++ b/Test/baseResults/lineContinuation100.vert.out
@@ -23,6 +23,7 @@ ERROR: 0:55: 'line continuation' : not supported for this version or the enabled
 ERROR: 20 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 100\r
 ERROR: node is still EOpNull!\r
 0:20  Function Definition: main( (void)\r
 0:20    Function Parameters: \r
@@ -95,4 +96,5 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 100\r
 \r

diff --git a/Test/baseResults/link1.frag.out b/Test/baseResults/link1.frag.out
index 693be98..0bdcabb 100644 (file)
--- a/Test/baseResults/link1.frag.out
+++ b/Test/baseResults/link1.frag.out
@@ -1,6 +1,7 @@
 link1.frag\r
 Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:8  Sequence\r
 0:8    move second child to first child (4-component vector of float)\r
@@ -82,6 +83,9 @@ Warning, version 130 is not yet complete; most features are present, but a few a
 link2.frag\r
 Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 \r
+Shader version: 130\r
+Requested GL_OES_standard_derivatives\r
+Requested GL_OES_texture_3D\r
 0:? Sequence\r
 0:8  Sequence\r
 0:8    move second child to first child (4-component vector of float)\r
@@ -151,6 +155,10 @@ Warning, version 130 is not yet complete; most features are present, but a few a
 \r
 link3.frag\r
 \r
+Shader version: 300\r
+Requested GL_OES_EGL_image_external\r
+Requested GL_OES_standard_derivatives\r
+Requested GL_OES_texture_3D\r
 0:? Sequence\r
 0:?   Linker Objects\r
 0:?     'iv3' (smooth in highp 2-component vector of float)\r
@@ -174,6 +182,10 @@ ERROR: Linking fragment stage: Types must match:
 ERROR: Linking fragment stage: Precision qualifiers must match:\r
     iv3: "smooth in 3-component vector of float" versus "smooth in highp 2-component vector of float"\r
 \r
+Shader version: 300\r
+Requested GL_OES_EGL_image_external\r
+Requested GL_OES_standard_derivatives\r
+Requested GL_OES_texture_3D\r
 0:? Sequence\r
 0:8  Sequence\r
 0:8    move second child to first child (4-component vector of float)\r

diff --git a/Test/baseResults/localAggregates.frag.out b/Test/baseResults/localAggregates.frag.out
index 95f72bb..9a3c6c8 100644 (file)
--- a/Test/baseResults/localAggregates.frag.out
+++ b/Test/baseResults/localAggregates.frag.out
@@ -3,6 +3,7 @@ Warning, version 130 is not yet complete; most features are present, but a few a
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release\r
 WARNING: 0:5: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:34  Function Definition: main( (void)\r
 0:34    Function Parameters: \r
@@ -209,4 +210,5 @@ WARNING: 0:5: varying deprecated in version 130; may be removed in future releas
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/loops.frag.out b/Test/baseResults/loops.frag.out
index db286d9..4ebdc5b 100644 (file)
--- a/Test/baseResults/loops.frag.out
+++ b/Test/baseResults/loops.frag.out
@@ -2,6 +2,7 @@
 Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 WARNING: 0:14: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:53  Function Definition: main( (void)\r
 0:53    Function Parameters: \r
@@ -969,4 +970,5 @@ WARNING: 0:14: varying deprecated in version 130; may be removed in future relea
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/loopsArtificial.frag.out b/Test/baseResults/loopsArtificial.frag.out
index 6a6aef8..b4ae4be 100644 (file)
--- a/Test/baseResults/loopsArtificial.frag.out
+++ b/Test/baseResults/loopsArtificial.frag.out
@@ -2,6 +2,7 @@
 Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 WARNING: 0:14: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:53  Function Definition: main( (void)\r
 0:53    Function Parameters: \r
@@ -218,4 +219,5 @@ WARNING: 0:14: varying deprecated in version 130; may be removed in future relea
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/mains1.frag.out b/Test/baseResults/mains1.frag.out
index 4510d74..7dbcb35 100644 (file)
--- a/Test/baseResults/mains1.frag.out
+++ b/Test/baseResults/mains1.frag.out
@@ -1,5 +1,6 @@
 mains1.frag\r
 \r
+Shader version: 110\r
 0:? Sequence\r
 0:3  Function Definition: main( (void)\r
 0:3    Function Parameters: \r
@@ -7,6 +8,7 @@ mains1.frag
 \r
 mains2.frag\r
 \r
+Shader version: 110\r
 0:? Sequence\r
 0:3  Function Definition: main( (void)\r
 0:3    Function Parameters: \r
@@ -18,6 +20,7 @@ Warning, version 150 is not yet complete; some version-specific features are pre
 ERROR: 1 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 150\r
 invocations = 0\r
 max_vertices = 0\r
 input primitive = none\r
@@ -30,6 +33,7 @@ ERROR: node is still EOpNull!
 noMain2.geom\r
 Warning, version 150 is not yet complete; some version-specific features are present, but many are missing.\r
 \r
+Shader version: 150\r
 invocations = 0\r
 max_vertices = 0\r
 input primitive = none\r
@@ -52,6 +56,7 @@ Linked fragment stage:
 ERROR: Linking fragment stage: Multiple function bodies in multiple compilation units for the same signature in the same stage:\r
     main(\r
 \r
+Shader version: 150\r
 invocations = 0\r
 max_vertices = 0\r
 input primitive = none\r
@@ -62,6 +67,7 @@ ERROR: node is still EOpNull!
 0:3  Function Definition: bar( (void)\r
 0:3    Function Parameters: \r
 0:?   Linker Objects\r
+Shader version: 110\r
 0:? Sequence\r
 0:3  Function Definition: main( (void)\r
 0:3    Function Parameters: \r

diff --git a/Test/baseResults/matrix.frag.out b/Test/baseResults/matrix.frag.out
index c0ad3eb..640d483 100644 (file)
--- a/Test/baseResults/matrix.frag.out
+++ b/Test/baseResults/matrix.frag.out
@@ -4,6 +4,7 @@ WARNING: 0:6: varying deprecated in version 130; may be removed in future releas
 WARNING: 0:17: varying deprecated in version 130; may be removed in future release\r
 WARNING: 0:22: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:25  Function Definition: main( (void)\r
 0:25    Function Parameters: \r
@@ -256,4 +257,5 @@ WARNING: 0:22: varying deprecated in version 130; may be removed in future relea
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/matrix2.frag.out b/Test/baseResults/matrix2.frag.out
index abcdbb0..bac7a5c 100644 (file)
--- a/Test/baseResults/matrix2.frag.out
+++ b/Test/baseResults/matrix2.frag.out
@@ -4,6 +4,7 @@ WARNING: 0:4: varying deprecated in version 130; may be removed in future releas
 WARNING: 0:13: varying deprecated in version 130; may be removed in future release\r
 WARNING: 0:15: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 150\r
 0:? Sequence\r
 0:19  Function Definition: main( (void)\r
 0:19    Function Parameters: \r
@@ -164,4 +165,5 @@ WARNING: 0:15: varying deprecated in version 130; may be removed in future relea
 Linked fragment stage:\r
 \r
 \r
+Shader version: 150\r
 \r

diff --git a/Test/baseResults/matrixError.vert.out b/Test/baseResults/matrixError.vert.out
index b3d120a..ecfc69c 100644 (file)
--- a/Test/baseResults/matrixError.vert.out
+++ b/Test/baseResults/matrixError.vert.out
@@ -9,6 +9,7 @@ ERROR: 0:21: '[' :  vector index out of range '4'
 ERROR: 7 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 120\r
 ERROR: node is still EOpNull!\r
 0:12  Function Definition: main( (void)\r
 0:12    Function Parameters: \r
@@ -40,4 +41,5 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 120\r
 \r

diff --git a/Test/baseResults/newTexture.frag.out b/Test/baseResults/newTexture.frag.out
index 4eec70a..4bf62c5 100644 (file)
--- a/Test/baseResults/newTexture.frag.out
+++ b/Test/baseResults/newTexture.frag.out
@@ -1,6 +1,7 @@
 ../../LunarGLASS/test/newTexture.frag\r
 Warning, version 430 is not yet complete; some version-specific features are present, but many are missing.\r
 \r
+Shader version: 430\r
 0:? Sequence\r
 0:34  Function Definition: main( (void)\r
 0:34    Function Parameters: \r
@@ -230,4 +231,5 @@ Warning, version 430 is not yet complete; some version-specific features are pre
 Linked fragment stage:\r
 \r
 \r
+Shader version: 430\r
 \r

diff --git a/Test/baseResults/noMain.vert.out b/Test/baseResults/noMain.vert.out
index fa97a7d..47068a1 100644 (file)
--- a/Test/baseResults/noMain.vert.out
+++ b/Test/baseResults/noMain.vert.out
@@ -1,5 +1,6 @@
 noMain.vert\r
 \r
+Shader version: 300\r
 0:? Sequence\r
 0:3  Function Definition: foo( (void)\r
 0:3    Function Parameters: \r
@@ -12,6 +13,7 @@ ERROR: 0:7: 'main' : function already has a body
 ERROR: 1 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 300\r
 ERROR: node is still EOpNull!\r
 0:3  Function Definition: main( (void)\r
 0:3    Function Parameters: \r
@@ -27,4 +29,6 @@ ERROR: Linking vertex stage: Missing entry point: Each stage requires one "void
 Linked fragment stage:\r
 \r
 \r
+Shader version: 300\r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/nonSquare.vert.out b/Test/baseResults/nonSquare.vert.out
index 23bb068..88bcc9c 100644 (file)
--- a/Test/baseResults/nonSquare.vert.out
+++ b/Test/baseResults/nonSquare.vert.out
@@ -1,5 +1,6 @@
 nonSquare.vert\r
 \r
+Shader version: 120\r
 0:? Sequence\r
 0:15  Function Definition: main( (void)\r
 0:15    Function Parameters: \r
@@ -92,4 +93,5 @@ nonSquare.vert
 Linked vertex stage:\r
 \r
 \r
+Shader version: 120\r
 \r

diff --git a/Test/baseResults/numeral.frag.out b/Test/baseResults/numeral.frag.out
index f1c6196..f276931 100644 (file)
--- a/Test/baseResults/numeral.frag.out
+++ b/Test/baseResults/numeral.frag.out
@@ -13,6 +13,7 @@ ERROR: 0:88: '' : float literal needs a decimal point or exponent
 ERROR: 10 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 400\r
 ERROR: node is still EOpNull!\r
 0:3  Function Definition: main( (void)\r
 0:3    Function Parameters: \r
@@ -384,4 +385,5 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 400\r
 \r

diff --git a/Test/baseResults/pointCoord.frag.out b/Test/baseResults/pointCoord.frag.out
index 2813257..0ad8c83 100644 (file)
--- a/Test/baseResults/pointCoord.frag.out
+++ b/Test/baseResults/pointCoord.frag.out
@@ -1,5 +1,6 @@
 pointCoord.frag\r
 \r
+Shader version: 100\r
 0:? Sequence\r
 0:5  Function Definition: main( (void)\r
 0:5    Function Parameters: \r
@@ -35,4 +36,5 @@ pointCoord.frag
 Linked fragment stage:\r
 \r
 \r
+Shader version: 100\r
 \r

diff --git a/Test/baseResults/precision.frag.out b/Test/baseResults/precision.frag.out
index 54daf02..2c961aa 100644 (file)
--- a/Test/baseResults/precision.frag.out
+++ b/Test/baseResults/precision.frag.out
@@ -9,6 +9,7 @@ ERROR: 0:76: 'bool' : type cannot have precision qualifier
 ERROR: 7 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 100\r
 ERROR: node is still EOpNull!\r
 0:5  Function Definition: foo(vf3; (lowp 2-component vector of float)\r
 0:5    Function Parameters: \r
@@ -127,4 +128,5 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 100\r
 \r

diff --git a/Test/baseResults/precision.vert.out b/Test/baseResults/precision.vert.out
index 529b628..0d9600d 100644 (file)
--- a/Test/baseResults/precision.vert.out
+++ b/Test/baseResults/precision.vert.out
@@ -5,6 +5,7 @@ ERROR: 0:14: 'sampler/image' : type requires declaration of default precision qu
 ERROR: 3 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 300\r
 ERROR: node is still EOpNull!\r
 0:18  Function Definition: main( (void)\r
 0:18    Function Parameters: \r
@@ -52,4 +53,5 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/prepost.frag.out b/Test/baseResults/prepost.frag.out
index daaacfb..7492a04 100644 (file)
--- a/Test/baseResults/prepost.frag.out
+++ b/Test/baseResults/prepost.frag.out
@@ -1,6 +1,7 @@
 ../../LunarGLASS/test/prepost.frag\r
 Warning, version 140 is not yet complete; most features are present, but a few are missing.\r
 \r
+Shader version: 140\r
 0:? Sequence\r
 0:3  Function Definition: main( (void)\r
 0:3    Function Parameters: \r
@@ -137,4 +138,5 @@ Warning, version 140 is not yet complete; most features are present, but a few a
 Linked fragment stage:\r
 \r
 \r
+Shader version: 140\r
 \r

diff --git a/Test/baseResults/recurse1.vert.out b/Test/baseResults/recurse1.vert.out
index c095a42..3c50053 100644 (file)
--- a/Test/baseResults/recurse1.vert.out
+++ b/Test/baseResults/recurse1.vert.out
@@ -1,6 +1,7 @@
 recurse1.vert\r
 Warning, version 330 is not yet complete; some version-specific features are present, but many are missing.\r
 \r
+Shader version: 330\r
 0:? Sequence\r
 0:3  Function Definition: main( (void)\r
 0:3    Function Parameters: \r
@@ -71,6 +72,7 @@ Warning, version 330 is not yet complete; some version-specific features are pre
 recurse1.frag\r
 Warning, version 330 is not yet complete; some version-specific features are present, but many are missing.\r
 \r
+Shader version: 330\r
 0:? Sequence\r
 0:5  Function Definition: main( (void)\r
 0:5    Function Parameters: \r
@@ -159,6 +161,7 @@ Warning, version 330 is not yet complete; some version-specific features are pre
 recurse2.frag\r
 Warning, version 330 is not yet complete; some version-specific features are present, but many are missing.\r
 \r
+Shader version: 330\r
 0:? Sequence\r
 0:9  Function Definition: cbar(i1; (float)\r
 0:9    Function Parameters: \r
@@ -217,6 +220,8 @@ ERROR: Linking fragment stage: Recursion detected:
 ERROR: Linking fragment stage: Recursion detected:\r
     cfoo(f1; calling cbar(i1;\r
 \r
+Shader version: 330\r
+Shader version: 330\r
 0:? Sequence\r
 0:5  Function Definition: main( (void)\r
 0:5    Function Parameters: \r

diff --git a/Test/baseResults/sample.frag.out b/Test/baseResults/sample.frag.out
index ad427f7..2d2bce9 100644 (file)
--- a/Test/baseResults/sample.frag.out
+++ b/Test/baseResults/sample.frag.out
@@ -1,5 +1,6 @@
 sample.frag\r
 \r
+Shader version: 110\r
 0:? Sequence\r
 0:38  Function Definition: main( (void)\r
 0:38    Function Parameters: \r
@@ -17,4 +18,5 @@ sample.frag
 Linked fragment stage:\r
 \r
 \r
+Shader version: 110\r
 \r

diff --git a/Test/baseResults/sample.vert.out b/Test/baseResults/sample.vert.out
index bd073fd..4179740 100644 (file)
--- a/Test/baseResults/sample.vert.out
+++ b/Test/baseResults/sample.vert.out
@@ -1,5 +1,6 @@
 sample.vert\r
 \r
+Shader version: 110\r
 0:? Sequence\r
 0:38  Function Definition: main( (void)\r
 0:38    Function Parameters: \r
@@ -22,4 +23,5 @@ sample.vert
 Linked vertex stage:\r
 \r
 \r
+Shader version: 110\r
 \r

diff --git a/Test/baseResults/simpleFunctionCall.frag.out b/Test/baseResults/simpleFunctionCall.frag.out
index 50fcb95..440dc97 100644 (file)
--- a/Test/baseResults/simpleFunctionCall.frag.out
+++ b/Test/baseResults/simpleFunctionCall.frag.out
@@ -2,6 +2,7 @@
 Warning, version 150 is not yet complete; some version-specific features are present, but many are missing.\r
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 150\r
 0:? Sequence\r
 0:7  Function Definition: foo( (4-component vector of float)\r
 0:7    Function Parameters: \r
@@ -23,4 +24,5 @@ WARNING: 0:4: varying deprecated in version 130; may be removed in future releas
 Linked fragment stage:\r
 \r
 \r
+Shader version: 150\r
 \r

diff --git a/Test/baseResults/specExamples.frag.out b/Test/baseResults/specExamples.frag.out
index 9c0c1c5..4c3fbd0 100644 (file)
--- a/Test/baseResults/specExamples.frag.out
+++ b/Test/baseResults/specExamples.frag.out
@@ -52,6 +52,8 @@ ERROR: 0:232: 'out' : not allowed in nested scope
 ERROR: 49 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 430\r
+Requested GL_3DL_array_objects\r
 gl_FragCoord pixel center is integer\r
 gl_FragCoord origin is upper left\r
 ERROR: node is still EOpNull!\r
@@ -302,6 +304,8 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 430\r
+Requested GL_3DL_array_objects\r
 gl_FragCoord pixel center is integer\r
 gl_FragCoord origin is upper left\r
 \r

diff --git a/Test/baseResults/specExamples.vert.out b/Test/baseResults/specExamples.vert.out
index dded395..d8ab03e 100644 (file)
--- a/Test/baseResults/specExamples.vert.out
+++ b/Test/baseResults/specExamples.vert.out
@@ -47,6 +47,8 @@ ERROR: 0:194: 'constructor' : constructing from a non-dereferenced array
 ERROR: 42 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 430\r
+Requested GL_3DL_array_objects\r
 ERROR: node is still EOpNull!\r
 0:134  Function Definition: funcA(I21; (4-component vector of float)\r
 0:134    Function Parameters: \r
@@ -321,4 +323,6 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 430\r
+Requested GL_3DL_array_objects\r
 \r

diff --git a/Test/baseResults/structAssignment.frag.out b/Test/baseResults/structAssignment.frag.out
index 4cf5d3e..32db99d 100644 (file)
--- a/Test/baseResults/structAssignment.frag.out
+++ b/Test/baseResults/structAssignment.frag.out
@@ -2,6 +2,7 @@
 Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:29  Function Definition: main( (void)\r
 0:29    Function Parameters: \r
@@ -53,4 +54,5 @@ WARNING: 0:4: varying deprecated in version 130; may be removed in future releas
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/structDeref.frag.out b/Test/baseResults/structDeref.frag.out
index c646d58..23890a1 100644 (file)
--- a/Test/baseResults/structDeref.frag.out
+++ b/Test/baseResults/structDeref.frag.out
@@ -2,6 +2,7 @@
 Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:41  Function Definition: main( (void)\r
 0:41    Function Parameters: \r
@@ -174,4 +175,5 @@ WARNING: 0:4: varying deprecated in version 130; may be removed in future releas
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/structure.frag.out b/Test/baseResults/structure.frag.out
index 735e0e0..90650a5 100644 (file)
--- a/Test/baseResults/structure.frag.out
+++ b/Test/baseResults/structure.frag.out
@@ -2,6 +2,7 @@
 Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 WARNING: 0:3: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:20  Function Definition: main( (void)\r
 0:20    Function Parameters: \r
@@ -84,4 +85,5 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/switch.frag.out b/Test/baseResults/switch.frag.out
index 8766619..0f0da26 100644 (file)
--- a/Test/baseResults/switch.frag.out
+++ b/Test/baseResults/switch.frag.out
@@ -20,6 +20,7 @@ ERROR: 0:140: 'nestedX' : undeclared identifier
 ERROR: 18 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 300\r
 ERROR: node is still EOpNull!\r
 0:6  Function Definition: main( (void)\r
 0:6    Function Parameters: \r
@@ -337,4 +338,5 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/swizzle.frag.out b/Test/baseResults/swizzle.frag.out
index b4e22b2..70806a6 100644 (file)
--- a/Test/baseResults/swizzle.frag.out
+++ b/Test/baseResults/swizzle.frag.out
@@ -1,5 +1,6 @@
 ../../LunarGLASS/test/swizzle.frag\r
 \r
+Shader version: 110\r
 0:? Sequence\r
 0:9  Function Definition: main( (void)\r
 0:9    Function Parameters: \r
@@ -212,4 +213,5 @@
 Linked fragment stage:\r
 \r
 \r
+Shader version: 110\r
 \r

diff --git a/Test/baseResults/syntaxError.frag.out b/Test/baseResults/syntaxError.frag.out
index 40c1f5a..7bdd729 100644 (file)
--- a/Test/baseResults/syntaxError.frag.out
+++ b/Test/baseResults/syntaxError.frag.out
@@ -4,6 +4,7 @@ ERROR: 0:9: '' :  syntax error
 ERROR: 2 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 120\r
 ERROR: node is still EOpNull!\r
 0:?   Linker Objects\r
 0:?     'bigColor' (uniform 4-component vector of float)\r
@@ -14,4 +15,5 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 120\r
 \r

diff --git a/Test/baseResults/test.frag.out b/Test/baseResults/test.frag.out
index 8e61b44..9b7c57a 100644 (file)
--- a/Test/baseResults/test.frag.out
+++ b/Test/baseResults/test.frag.out
@@ -1,5 +1,6 @@
 ../../LunarGLASS/test/test.frag\r
 \r
+Shader version: 110\r
 0:? Sequence\r
 0:13  Function Definition: main( (void)\r
 0:13    Function Parameters: \r
@@ -58,4 +59,5 @@
 Linked fragment stage:\r
 \r
 \r
+Shader version: 110\r
 \r

diff --git a/Test/baseResults/texture.frag.out b/Test/baseResults/texture.frag.out
index 15a5482..d4a44f1 100644 (file)
--- a/Test/baseResults/texture.frag.out
+++ b/Test/baseResults/texture.frag.out
@@ -3,6 +3,7 @@ Warning, version 130 is not yet complete; most features are present, but a few a
 WARNING: 0:14: varying deprecated in version 130; may be removed in future release\r
 WARNING: 0:15: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:17  Function Definition: main( (void)\r
 0:17    Function Parameters: \r
@@ -284,4 +285,5 @@ WARNING: 0:15: varying deprecated in version 130; may be removed in future relea
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/tokenLength.vert.out b/Test/baseResults/tokenLength.vert.out
index a75d43b..973df47 100644 (file)
--- a/Test/baseResults/tokenLength.vert.out
+++ b/Test/baseResults/tokenLength.vert.out
@@ -16,6 +16,7 @@ ERROR: 0:36: '' : float literal too long
 ERROR: 14 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 300\r
 ERROR: node is still EOpNull!\r
 0:9  Sequence\r
 0:9    move second child to first child (highp int)\r
@@ -111,4 +112,5 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/types.frag.out b/Test/baseResults/types.frag.out
index cbd55e0..793d085 100644 (file)
--- a/Test/baseResults/types.frag.out
+++ b/Test/baseResults/types.frag.out
@@ -1,6 +1,7 @@
 ../../LunarGLASS/test/types.frag\r
 Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:33  Function Definition: main( (void)\r
 0:33    Function Parameters: \r
@@ -340,4 +341,5 @@ Warning, version 130 is not yet complete; most features are present, but a few a
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/uint.frag.out b/Test/baseResults/uint.frag.out
index 155aa9c..de34477 100644 (file)
--- a/Test/baseResults/uint.frag.out
+++ b/Test/baseResults/uint.frag.out
@@ -11,6 +11,7 @@ ERROR: 0:63: 'float' : type requires declaration of default precision qualifier
 ERROR: 9 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 300\r
 ERROR: node is still EOpNull!\r
 0:15  Function Definition: main( (void)\r
 0:15    Function Parameters: \r
@@ -309,4 +310,5 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/uniformArray.frag.out b/Test/baseResults/uniformArray.frag.out
index 6156ddb..2d2cce1 100644 (file)
--- a/Test/baseResults/uniformArray.frag.out
+++ b/Test/baseResults/uniformArray.frag.out
@@ -1,6 +1,7 @@
 ../../LunarGLASS/test/uniformArray.frag\r
 Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:7  Function Definition: main( (void)\r
 0:7    Function Parameters: \r
@@ -50,4 +51,5 @@ Warning, version 130 is not yet complete; most features are present, but a few a
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/variableArrayIndex.frag.out b/Test/baseResults/variableArrayIndex.frag.out
index 565373e..eae4a6a 100644 (file)
--- a/Test/baseResults/variableArrayIndex.frag.out
+++ b/Test/baseResults/variableArrayIndex.frag.out
@@ -2,6 +2,7 @@
 Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 WARNING: 0:3: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:29  Function Definition: main( (void)\r
 0:29    Function Parameters: \r
@@ -114,4 +115,5 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/varyingArray.frag.out b/Test/baseResults/varyingArray.frag.out
index e930a0d..f6b1089 100644 (file)
--- a/Test/baseResults/varyingArray.frag.out
+++ b/Test/baseResults/varyingArray.frag.out
@@ -5,6 +5,7 @@ WARNING: 0:4: varying deprecated in version 130; may be removed in future releas
 WARNING: 0:6: varying deprecated in version 130; may be removed in future release\r
 WARNING: 0:8: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:10  Function Definition: main( (void)\r
 0:10    Function Parameters: \r
@@ -63,4 +64,5 @@ WARNING: 0:8: varying deprecated in version 130; may be removed in future releas
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/varyingArrayIndirect.frag.out b/Test/baseResults/varyingArrayIndirect.frag.out
index b23fb63..6f97318 100644 (file)
--- a/Test/baseResults/varyingArrayIndirect.frag.out
+++ b/Test/baseResults/varyingArrayIndirect.frag.out
@@ -5,6 +5,7 @@ WARNING: 0:4: varying deprecated in version 130; may be removed in future releas
 WARNING: 0:6: varying deprecated in version 130; may be removed in future release\r
 WARNING: 0:8: varying deprecated in version 130; may be removed in future release\r
 \r
+Shader version: 130\r
 0:? Sequence\r
 0:12  Function Definition: main( (void)\r
 0:12    Function Parameters: \r
@@ -66,4 +67,5 @@ WARNING: 0:8: varying deprecated in version 130; may be removed in future releas
 Linked fragment stage:\r
 \r
 \r
+Shader version: 130\r
 \r

diff --git a/Test/baseResults/versionsClean.frag.out b/Test/baseResults/versionsClean.frag.out
index 1a73847..d66a9f9 100644 (file)
--- a/Test/baseResults/versionsClean.frag.out
+++ b/Test/baseResults/versionsClean.frag.out
@@ -4,6 +4,7 @@ ERROR: 0:34: '#version' : must occur first in shader
 ERROR: 2 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 300\r
 ERROR: node is still EOpNull!\r
 0:41  Function Definition: main( (void)\r
 0:41    Function Parameters: \r
@@ -24,4 +25,5 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 300\r
 \r

diff --git a/Test/baseResults/versionsClean.vert.out b/Test/baseResults/versionsClean.vert.out
index 1f7b5d5..16cf56d 100644 (file)
--- a/Test/baseResults/versionsClean.vert.out
+++ b/Test/baseResults/versionsClean.vert.out
@@ -1,6 +1,7 @@
 versionsClean.vert\r
 Warning, version 420 is not yet complete; some version-specific features are present, but many are missing.\r
 \r
+Shader version: 420\r
 0:? Sequence\r
 0:40  Function Definition: main( (void)\r
 0:40    Function Parameters: \r
@@ -24,4 +25,5 @@ Warning, version 420 is not yet complete; some version-specific features are pre
 Linked vertex stage:\r
 \r
 \r
+Shader version: 420\r
 \r

diff --git a/Test/baseResults/versionsErrors.frag.out b/Test/baseResults/versionsErrors.frag.out
index 91f035b..0547d24 100644 (file)
--- a/Test/baseResults/versionsErrors.frag.out
+++ b/Test/baseResults/versionsErrors.frag.out
@@ -6,6 +6,7 @@ ERROR: 0:44: 'floating-point suffix' : not supported for this version or the ena
 ERROR: 4 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 110\r
 ERROR: node is still EOpNull!\r
 0:42  Function Definition: main( (void)\r
 0:42    Function Parameters: \r
@@ -25,4 +26,5 @@ ERROR: node is still EOpNull!
 Linked fragment stage:\r
 \r
 \r
+Shader version: 110\r
 \r

diff --git a/Test/baseResults/versionsErrors.vert.out b/Test/baseResults/versionsErrors.vert.out
index 77d062f..3964085 100644 (file)
--- a/Test/baseResults/versionsErrors.vert.out
+++ b/Test/baseResults/versionsErrors.vert.out
@@ -6,6 +6,8 @@ ERROR: 0:45: 'discard' : not supported in this stage: vertex
 ERROR: 2 compilation errors.  No code generated.\r
 \r
 \r
+Shader version: 420\r
+Requested GL_ARB_texture_rectangle\r
 ERROR: node is still EOpNull!\r
 0:42  Function Definition: main( (void)\r
 0:42    Function Parameters: \r
@@ -30,4 +32,6 @@ ERROR: node is still EOpNull!
 Linked vertex stage:\r
 \r
 \r
+Shader version: 420\r
+Requested GL_ARB_texture_rectangle\r
 \r

diff --git a/Test/baseResults/voidFunction.frag.out b/Test/baseResults/voidFunction.frag.out
index 2a408ff..8e071fc 100644 (file)
--- a/Test/baseResults/voidFunction.frag.out
+++ b/Test/baseResults/voidFunction.frag.out
@@ -1,5 +1,6 @@
 ../../LunarGLASS/test/voidFunction.frag\r
 \r
+Shader version: 120\r
 0:? Sequence\r
 0:7  Sequence\r
 0:7    move second child to first child (float)\r
@@ -46,4 +47,5 @@
 Linked fragment stage:\r
 \r
 \r
+Shader version: 120\r
 \r

diff --git a/Test/baseResults/whileLoop.frag.out b/Test/baseResults/whileLoop.frag.out
index fc1377e..9539e2c 100644 (file)
--- a/Test/baseResults/whileLoop.frag.out
+++ b/Test/baseResults/whileLoop.frag.out
@@ -1,5 +1,6 @@
 ../../LunarGLASS/test/whileLoop.frag\r
 \r
+Shader version: 110\r
 0:? Sequence\r
 0:7  Function Definition: main( (void)\r
 0:7    Function Parameters: \r
@@ -33,4 +34,5 @@
 Linked fragment stage:\r
 \r
 \r
+Shader version: 110\r
 \r

diff --git a/Test/link2.frag b/Test/link2.frag
index 3eb265e..7c69891 100644 (file)
--- a/Test/link2.frag
+++ b/Test/link2.frag
@@ -31,3 +31,6 @@ struct S {
 uniform S s = S(82, 3.9);\r
 uniform S sn = S(82, 3.9);\r
 uniform S se = S(81, 3.9);\r
+\r
+#extension GL_OES_texture_3D : enable\r
+#extension GL_OES_standard_derivatives : enable\r

diff --git a/Test/link3.frag b/Test/link3.frag
index a9604c4..f886b23 100644 (file)
--- a/Test/link3.frag
+++ b/Test/link3.frag
@@ -3,3 +3,7 @@
 precision highp float;\r
 \r
 in vec2 iv3;\r
+\r
+#extension GL_OES_standard_derivatives : enable\r
+#extension GL_OES_EGL_image_external : require\r
+#extension GL_OES_texture_3D : enable\r

diff --git a/glslang/MachineIndependent/Versions.cpp b/glslang/MachineIndependent/Versions.cpp
index f4ba5b3..e5721e3 100644 (file)
--- a/glslang/MachineIndependent/Versions.cpp
+++ b/glslang/MachineIndependent/Versions.cpp
@@ -457,6 +457,8 @@ void TParseContext::updateExtensionBehavior(const char* extension, const char* b
         } else {
             if (iter->second == EBhDisablePartial)
                 warn(getCurrentLoc(), "extension is only partially supported:", "#extension", extension);
+            if (behavior == EBhEnable || behavior == EBhRequire)
+                intermediate.addRequestedExtension(extension);
             iter->second = behavior;
         }
     }

diff --git a/glslang/MachineIndependent/intermOut.cpp b/glslang/MachineIndependent/intermOut.cpp
index 9f89cad..36de123 100644 (file)
--- a/glslang/MachineIndependent/intermOut.cpp
+++ b/glslang/MachineIndependent/intermOut.cpp
@@ -579,6 +579,12 @@ bool TOutputTraverser::visitSwitch(TVisit /* visit */, TIntermSwitch* node)
 //
 void TIntermediate::output(TInfoSink& infoSink, bool tree)
 {
+    infoSink.debug << "Shader version: " << version << "\n";
+    if (requestedExtensions.size() > 0) {
+        for (std::set<std::string>::const_iterator extIt = requestedExtensions.begin(); extIt != requestedExtensions.end(); ++extIt)
+            infoSink.debug << "Requested " << *extIt << "\n";
+    }
+
     if (xfbMode)
         infoSink.debug << "in xfb mode\n";
 

diff --git a/glslang/MachineIndependent/linkValidate.cpp b/glslang/MachineIndependent/linkValidate.cpp
index 44b350e..7674aa9 100644 (file)
--- a/glslang/MachineIndependent/linkValidate.cpp
+++ b/glslang/MachineIndependent/linkValidate.cpp
@@ -131,11 +131,16 @@ void TIntermediate::merge(TInfoSink& infoSink, TIntermediate& unit)
         return;\r
 \r
     if (treeRoot == 0) {\r
-        version = unit.version;\r
         treeRoot = unit.treeRoot;\r
+        version = unit.version;\r
+        requestedExtensions = unit.requestedExtensions;\r
         return;\r
-    } else\r
-        version = std::max(version, unit.version);\r
+    }\r
+\r
+    // Getting this far means we have two existing trees to merge...\r
+    \r
+    version = std::max(version, unit.version);\r
+    requestedExtensions.insert(unit.requestedExtensions.begin(), unit.requestedExtensions.end());\r
 \r
     // Get the top-level globals of each unit\r
     TIntermSequence& globals = treeRoot->getAsAggregate()->getSequence();\r

diff --git a/glslang/MachineIndependent/localintermediate.h b/glslang/MachineIndependent/localintermediate.h
index aad8135..621772f 100644 (file)
--- a/glslang/MachineIndependent/localintermediate.h
+++ b/glslang/MachineIndependent/localintermediate.h
@@ -127,6 +127,9 @@ public:
     void setProfile(EProfile p) { profile = p; }
     EProfile getProfile() const { return profile; }
     EShLanguage getStage() const { return language; }
+    void addRequestedExtension(const char* extension) { requestedExtensions.insert(extension); }
+    const std::set<std::string>& getRequestedExtensions() const { return requestedExtensions; }
+
     void setTreeRoot(TIntermNode* r) { treeRoot = r; }
     TIntermNode* getTreeRoot() const { return treeRoot; }
     void addMainCount() { ++numMains; }
@@ -255,11 +258,11 @@ protected:
     bool userOutputUsed() const;
     int getBaseAlignmentScalar(const TType&, int& size) const;
 
-protected:
     const EShLanguage language;
     TIntermNode* treeRoot;
     EProfile profile;
     int version;
+    std::set<std::string> requestedExtensions;  // cumulation of all enabled or required extensions; not connected to what subset of the shader used them
     TBuiltInResource resources;
     int numMains;
     int numErrors;