Add message indicating level of completeness for not-yet-complete versions.

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

diff --git a/Test/baseResults/120.frag.out b/Test/baseResults/120.frag.out
index a396c84..f48f2d2 100644 (file)
--- a/Test/baseResults/120.frag.out
+++ b/Test/baseResults/120.frag.out
@@ -1,3 +1,4 @@
+Warning, version 120 is not yet complete; most features are present, but a few are missing.\r
 ERROR: 0:9: 'in for stage inputs' : not supported for this version or the enabled extensions \r
 ERROR: 0:10: 'out for stage outputs' : not supported for this version or the enabled extensions \r
 ERROR: 0:54: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type '2-component vector of float' and a right operand of type '3-component vector of float' (or there is no acceptable conversion)\r

diff --git a/Test/baseResults/120.vert.out b/Test/baseResults/120.vert.out
index f0395f3..735fdb3 100644 (file)
--- a/Test/baseResults/120.vert.out
+++ b/Test/baseResults/120.vert.out
@@ -1,3 +1,4 @@
+Warning, version 120 is not yet complete; most features are present, but a few are missing.\r
 ERROR: 0:3: 'in for stage inputs' : not supported for this version or the enabled extensions \r
 ERROR: 0:4: 'out for stage outputs' : not supported for this version or the enabled extensions \r
 ERROR: 0:11: 'gl_Position' : cannot add storage, auxiliary, memory, interpolation, or precision qualifier to an existing variable \r

diff --git a/Test/baseResults/130.frag.out b/Test/baseResults/130.frag.out
index b1eada0..5ed7048 100644 (file)
--- a/Test/baseResults/130.frag.out
+++ b/Test/baseResults/130.frag.out
@@ -1,3 +1,4 @@
+Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:16  Function Definition: main( (void)\r
 0:16    Function Parameters: \r

diff --git a/Test/baseResults/140.frag.out b/Test/baseResults/140.frag.out
index 15a238e..8dc506c 100644 (file)
--- a/Test/baseResults/140.frag.out
+++ b/Test/baseResults/140.frag.out
@@ -1,3 +1,4 @@
+Warning, version 140 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
 ERROR: 0:14: '#error' : GL_ES is not set  \r
 ERROR: 1 compilation errors.  No code generated.\r

diff --git a/Test/baseResults/330.frag.out b/Test/baseResults/330.frag.out
index 8e5906b..d9d0bbf 100644 (file)
--- a/Test/baseResults/330.frag.out
+++ b/Test/baseResults/330.frag.out
@@ -1,3 +1,4 @@
+Warning, version 330 is not yet complete; some version-specific are present, but many are missing.\r
 WARNING: 0:6: varying deprecated in version 130; may be removed in future release\r
 0:? Sequence\r
 0:8  Function Definition: main( (void)\r

diff --git a/Test/baseResults/330comp.frag.out b/Test/baseResults/330comp.frag.out
index 1917bb4..9a76d4f 100644 (file)
--- a/Test/baseResults/330comp.frag.out
+++ b/Test/baseResults/330comp.frag.out
@@ -1,3 +1,4 @@
+Warning, version 330 is not yet complete; some version-specific are present, but many are missing.\r
 0:? Sequence\r
 0:8  Function Definition: main( (void)\r
 0:8    Function Parameters: \r

diff --git a/Test/baseResults/400.frag.out b/Test/baseResults/400.frag.out
index df37e93..eec0658 100644 (file)
--- a/Test/baseResults/400.frag.out
+++ b/Test/baseResults/400.frag.out
@@ -1,3 +1,4 @@
+Warning, version 330 is not yet complete; some version-specific are present, but many are missing.\r
 ERROR: 0:11: 'variable indexing sampler array' : not supported for this version or the enabled extensions \r
 ERROR: 1 compilation errors.  No code generated.\r
 \r

diff --git a/Test/baseResults/400.geom.out b/Test/baseResults/400.geom.out
index 88769fd..d27f7ad 100644 (file)
--- a/Test/baseResults/400.geom.out
+++ b/Test/baseResults/400.geom.out
@@ -1,3 +1,4 @@
+Warning, version 400 is not yet complete; some version-specific are present, but many are missing.\r
 0:? Sequence\r
 0:3  Function Definition: main( (void)\r
 0:3    Function Parameters: \r

diff --git a/Test/baseResults/400.tesc.out b/Test/baseResults/400.tesc.out
index 05a8a20..f356a5f 100644 (file)
--- a/Test/baseResults/400.tesc.out
+++ b/Test/baseResults/400.tesc.out
@@ -1,3 +1,4 @@
+Warning, version 400 is not yet complete; some version-specific are present, but many are missing.\r
 0:? Sequence\r
 0:3  Function Definition: main( (void)\r
 0:3    Function Parameters: \r

diff --git a/Test/baseResults/400.tese.out b/Test/baseResults/400.tese.out
index 033c642..e369c8f 100644 (file)
--- a/Test/baseResults/400.tese.out
+++ b/Test/baseResults/400.tese.out
@@ -1,3 +1,4 @@
+Warning, version 400 is not yet complete; some version-specific are present, but many are missing.\r
 ERROR: 0:5: 'barrier' : no matching overloaded function found \r
 ERROR: 1 compilation errors.  No code generated.\r
 \r

diff --git a/Test/baseResults/420.tese.out b/Test/baseResults/420.tese.out
index f44d24c..bf47c37 100644 (file)
--- a/Test/baseResults/420.tese.out
+++ b/Test/baseResults/420.tese.out
@@ -1,3 +1,4 @@
+Warning, version 420 is not yet complete; some version-specific are present, but many are missing.\r
 0:? Sequence\r
 0:3  Function Definition: main( (void)\r
 0:3    Function Parameters: \r

diff --git a/Test/baseResults/420.vert.out b/Test/baseResults/420.vert.out
index 01bfda7..373af19 100644 (file)
--- a/Test/baseResults/420.vert.out
+++ b/Test/baseResults/420.vert.out
@@ -1,3 +1,4 @@
+Warning, version 420 is not yet complete; some version-specific are present, but many are missing.\r
 WARNING: 0:3: varying deprecated in version 130; may be removed in future release\r
 ERROR: 0:3: 'varying' : no longer supported in core profile; removed in version 420\r
 ERROR: 0:7: '' : vertex input cannot be further qualified \r

diff --git a/Test/baseResults/430.comp.out b/Test/baseResults/430.comp.out
index feac3c3..834791b 100644 (file)
--- a/Test/baseResults/430.comp.out
+++ b/Test/baseResults/430.comp.out
@@ -1,3 +1,4 @@
+Warning, version 430 is not yet complete; some version-specific are present, but many are missing.\r
 0:? Sequence\r
 0:3  Function Definition: main( (void)\r
 0:3    Function Parameters: \r

diff --git a/Test/baseResults/430scope.vert.out b/Test/baseResults/430scope.vert.out
index 7a42aa7..4c600de 100644 (file)
--- a/Test/baseResults/430scope.vert.out
+++ b/Test/baseResults/430scope.vert.out
@@ -1,3 +1,4 @@
+Warning, version 430 is not yet complete; some version-specific are present, but many are missing.\r
 ERROR: 0:5: 'a' : redefinition \r
 ERROR: 0:17: 'b' : illegal redeclaration \r
 ERROR: 0:19: 'f' : redefinition \r

diff --git a/Test/baseResults/Operations.frag.out b/Test/baseResults/Operations.frag.out
index f882301..434df49 100644 (file)
--- a/Test/baseResults/Operations.frag.out
+++ b/Test/baseResults/Operations.frag.out
@@ -1,3 +1,4 @@
+Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:15  Function Definition: main( (void)\r
 0:15    Function Parameters: \r

diff --git a/Test/baseResults/aggOps.frag.out b/Test/baseResults/aggOps.frag.out
index 5ce7323..c2f1a63 100644 (file)
--- a/Test/baseResults/aggOps.frag.out
+++ b/Test/baseResults/aggOps.frag.out
@@ -1,3 +1,4 @@
+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
 WARNING: 0:6: varying deprecated in version 130; may be removed in future release\r
 0:? Sequence\r

diff --git a/Test/baseResults/always-discard.frag.out b/Test/baseResults/always-discard.frag.out
index 579e3ec..76055e5 100644 (file)
--- a/Test/baseResults/always-discard.frag.out
+++ b/Test/baseResults/always-discard.frag.out
@@ -1,3 +1,4 @@
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:4  Function Definition: main( (void)\r
 0:4    Function Parameters: \r

diff --git a/Test/baseResults/always-discard2.frag.out b/Test/baseResults/always-discard2.frag.out
index 401fab7..724c8ae 100644 (file)
--- a/Test/baseResults/always-discard2.frag.out
+++ b/Test/baseResults/always-discard2.frag.out
@@ -1,3 +1,4 @@
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:4  Function Definition: main( (void)\r
 0:4    Function Parameters: \r

diff --git a/Test/baseResults/array.frag.out b/Test/baseResults/array.frag.out
index eac0736..b87a9bf 100644 (file)
--- a/Test/baseResults/array.frag.out
+++ b/Test/baseResults/array.frag.out
@@ -1,3 +1,4 @@
+Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 ERROR: 0:21: '[' :  array index out of range '2'\r
 ERROR: 0:27: '[' :  array must be redeclared with a size before being indexed with a variable\r
 ERROR: 0:30: 'assign' :  cannot convert from '4-element array of float' to '5-element array of float'\r

diff --git a/Test/baseResults/comment.frag.out b/Test/baseResults/comment.frag.out
index 5f748f1..5084e36 100644 (file)
--- a/Test/baseResults/comment.frag.out
+++ b/Test/baseResults/comment.frag.out
@@ -1,3 +1,4 @@
+Warning, version 430 is not yet complete; some version-specific are present, but many are missing.\r
 0:? Sequence\r
 0:17  Function Definition: main( (void)\r
 0:17    Function Parameters: \r

diff --git a/Test/baseResults/conditionalDiscard.frag.out b/Test/baseResults/conditionalDiscard.frag.out
index a4c3e6c..1d3359b 100644 (file)
--- a/Test/baseResults/conditionalDiscard.frag.out
+++ b/Test/baseResults/conditionalDiscard.frag.out
@@ -1,3 +1,4 @@
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:6  Function Definition: main( (void)\r
 0:6    Function Parameters: \r

diff --git a/Test/baseResults/constErrors.frag.out b/Test/baseResults/constErrors.frag.out
index 692529e..14c9a7a 100644 (file)
--- a/Test/baseResults/constErrors.frag.out
+++ b/Test/baseResults/constErrors.frag.out
@@ -1,3 +1,4 @@
+Warning, version 330 is not yet complete; some version-specific are present, but many are missing.\r
 ERROR: 0:14: '=' :  assigning non-constant to 'const int'\r
 ERROR: 0:17: '' : constant expression required \r
 ERROR: 0:17: '' : array size must be a constant integer expression \r

diff --git a/Test/baseResults/constFold.frag.out b/Test/baseResults/constFold.frag.out
index 539a331..22cf44f 100644 (file)
--- a/Test/baseResults/constFold.frag.out
+++ b/Test/baseResults/constFold.frag.out
@@ -1,3 +1,4 @@
+Warning, version 430 is not yet complete; some version-specific are present, but many are missing.\r
 0:? Sequence\r
 0:28  Function Definition: main( (void)\r
 0:28    Function Parameters: \r

diff --git a/Test/baseResults/conversion.frag.out b/Test/baseResults/conversion.frag.out
index 2379ea1..ec3d2f6 100644 (file)
--- a/Test/baseResults/conversion.frag.out
+++ b/Test/baseResults/conversion.frag.out
@@ -1,3 +1,4 @@
+Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:33  Function Definition: main( (void)\r
 0:33    Function Parameters: \r

diff --git a/Test/baseResults/cppIndent.vert.out b/Test/baseResults/cppIndent.vert.out
index 221640e..93c643a 100644 (file)
--- a/Test/baseResults/cppIndent.vert.out
+++ b/Test/baseResults/cppIndent.vert.out
@@ -1,3 +1,4 @@
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:5  Sequence\r
 0:5    move second child to first child (float)\r

diff --git a/Test/baseResults/cppNest.vert.out b/Test/baseResults/cppNest.vert.out
index 918f832..60255be 100644 (file)
--- a/Test/baseResults/cppNest.vert.out
+++ b/Test/baseResults/cppNest.vert.out
@@ -1,3 +1,4 @@
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:5  Sequence\r
 0:5    move second child to first child (float)\r

diff --git a/Test/baseResults/cppSimple.vert.out b/Test/baseResults/cppSimple.vert.out
index 89201f1..48dfcff 100644 (file)
--- a/Test/baseResults/cppSimple.vert.out
+++ b/Test/baseResults/cppSimple.vert.out
@@ -1,3 +1,4 @@
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 ERROR: 0:77: '#error' : good1  \r
 ERROR: 0:81: '#error' : good2  \r
 ERROR: 0:85: '#error' : good3  \r

diff --git a/Test/baseResults/dataOut.frag.out b/Test/baseResults/dataOut.frag.out
index f23cfc3..a57aec3 100644 (file)
--- a/Test/baseResults/dataOut.frag.out
+++ b/Test/baseResults/dataOut.frag.out
@@ -1,3 +1,4 @@
+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
 0:? Sequence\r
 0:5  Function Definition: main( (void)\r

diff --git a/Test/baseResults/dataOutIndirect.frag.out b/Test/baseResults/dataOutIndirect.frag.out
index 5a6f27d..5e18a6a 100644 (file)
--- a/Test/baseResults/dataOutIndirect.frag.out
+++ b/Test/baseResults/dataOutIndirect.frag.out
@@ -1,3 +1,4 @@
+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
 0:? Sequence\r
 0:7  Function Definition: main( (void)\r

diff --git a/Test/baseResults/dce.frag.out b/Test/baseResults/dce.frag.out
index 06ffada..9d800f6 100644 (file)
--- a/Test/baseResults/dce.frag.out
+++ b/Test/baseResults/dce.frag.out
@@ -1,3 +1,4 @@
+Warning, version 400 is not yet complete; some version-specific are present, but many are missing.\r
 0:? Sequence\r
 0:5  Sequence\r
 0:5    move second child to first child (int)\r

diff --git a/Test/baseResults/decls.frag.out b/Test/baseResults/decls.frag.out
index f965ed9..6e11cff 100644 (file)
--- a/Test/baseResults/decls.frag.out
+++ b/Test/baseResults/decls.frag.out
@@ -1,3 +1,4 @@
+Warning, version 120 is not yet complete; most features are present, but a few are missing.\r
 ERROR: 0:19: 'vi4' : illegal use of type 'void' \r
 ERROR: 0:20: 'vj' : illegal use of type 'void' \r
 ERROR: 0:20: 'vk5' : illegal use of type 'void' \r

diff --git a/Test/baseResults/deepRvalue.frag.out b/Test/baseResults/deepRvalue.frag.out
index 2591dec..e1e5975 100644 (file)
--- a/Test/baseResults/deepRvalue.frag.out
+++ b/Test/baseResults/deepRvalue.frag.out
@@ -1,3 +1,4 @@
+Warning, version 120 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:5  Sequence\r
 0:5    move second child to first child (4-component vector of float)\r

diff --git a/Test/baseResults/depthOut.frag.out b/Test/baseResults/depthOut.frag.out
index 77c448a..dc2bd1c 100644 (file)
--- a/Test/baseResults/depthOut.frag.out
+++ b/Test/baseResults/depthOut.frag.out
@@ -1,3 +1,4 @@
+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
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release\r
 0:? Sequence\r

diff --git a/Test/baseResults/discard-dce.frag.out b/Test/baseResults/discard-dce.frag.out
index 97f012b..6cc24a0 100644 (file)
--- a/Test/baseResults/discard-dce.frag.out
+++ b/Test/baseResults/discard-dce.frag.out
@@ -1,3 +1,4 @@
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:4  Function Definition: main( (void)\r
 0:4    Function Parameters: \r

diff --git a/Test/baseResults/doWhileLoop.frag.out b/Test/baseResults/doWhileLoop.frag.out
index 32956c4..7071474 100644 (file)
--- a/Test/baseResults/doWhileLoop.frag.out
+++ b/Test/baseResults/doWhileLoop.frag.out
@@ -1,3 +1,4 @@
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:7  Function Definition: main( (void)\r
 0:7    Function Parameters: \r

diff --git a/Test/baseResults/earlyReturnDiscard.frag.out b/Test/baseResults/earlyReturnDiscard.frag.out
index 288f55e..3b6144b 100644 (file)
--- a/Test/baseResults/earlyReturnDiscard.frag.out
+++ b/Test/baseResults/earlyReturnDiscard.frag.out
@@ -1,3 +1,4 @@
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:19  Function Definition: main( (void)\r
 0:19    Function Parameters: \r

diff --git a/Test/baseResults/flowControl.frag.out b/Test/baseResults/flowControl.frag.out
index 606671d..d237e72 100644 (file)
--- a/Test/baseResults/flowControl.frag.out
+++ b/Test/baseResults/flowControl.frag.out
@@ -1,3 +1,4 @@
+Warning, version 120 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:10  Function Definition: main( (void)\r
 0:10    Function Parameters: \r

diff --git a/Test/baseResults/forLoop.frag.out b/Test/baseResults/forLoop.frag.out
index 5db7911..4fec579 100644 (file)
--- a/Test/baseResults/forLoop.frag.out
+++ b/Test/baseResults/forLoop.frag.out
@@ -1,3 +1,4 @@
+Warning, version 120 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:8  Function Definition: main( (void)\r
 0:8    Function Parameters: \r

diff --git a/Test/baseResults/forwardRef.frag.out b/Test/baseResults/forwardRef.frag.out
index d63454a..6ea65d7 100644 (file)
--- a/Test/baseResults/forwardRef.frag.out
+++ b/Test/baseResults/forwardRef.frag.out
@@ -1,3 +1,4 @@
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:11  Function Definition: main( (void)\r
 0:11    Function Parameters: \r

diff --git a/Test/baseResults/functionCall.frag.out b/Test/baseResults/functionCall.frag.out
index 2257197..e9a8af9 100644 (file)
--- a/Test/baseResults/functionCall.frag.out
+++ b/Test/baseResults/functionCall.frag.out
@@ -1,3 +1,4 @@
+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
 0:? Sequence\r
 0:7  Sequence\r

diff --git a/Test/baseResults/length.frag.out b/Test/baseResults/length.frag.out
index f7f53ac..c4438c5 100644 (file)
--- a/Test/baseResults/length.frag.out
+++ b/Test/baseResults/length.frag.out
@@ -1,3 +1,4 @@
+Warning, version 120 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:11  Function Definition: main( (void)\r
 0:11    Function Parameters: \r

diff --git a/Test/baseResults/link1.frag.out b/Test/baseResults/link1.frag.out
index 06d1d4a..d6e8d8d 100644 (file)
--- a/Test/baseResults/link1.frag.out
+++ b/Test/baseResults/link1.frag.out
@@ -1,4 +1,5 @@
 link1.frag\r
+Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 \r
 0:? Sequence\r
 0:8  Sequence\r
@@ -79,6 +80,7 @@ link1.frag
 0:?       3.900000\r
 \r
 link2.frag\r
+Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 \r
 0:? Sequence\r
 0:8  Sequence\r

diff --git a/Test/baseResults/localAggregates.frag.out b/Test/baseResults/localAggregates.frag.out
index 4ee071d..bf638b3 100644 (file)
--- a/Test/baseResults/localAggregates.frag.out
+++ b/Test/baseResults/localAggregates.frag.out
@@ -1,3 +1,4 @@
+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
 WARNING: 0:5: varying deprecated in version 130; may be removed in future release\r
 0:? Sequence\r

diff --git a/Test/baseResults/loops.frag.out b/Test/baseResults/loops.frag.out
index 3937067..64cb131 100644 (file)
--- a/Test/baseResults/loops.frag.out
+++ b/Test/baseResults/loops.frag.out
@@ -1,3 +1,4 @@
+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
 0:? Sequence\r
 0:53  Function Definition: main( (void)\r

diff --git a/Test/baseResults/loopsArtificial.frag.out b/Test/baseResults/loopsArtificial.frag.out
index d63d8ed..ec6ec79 100644 (file)
--- a/Test/baseResults/loopsArtificial.frag.out
+++ b/Test/baseResults/loopsArtificial.frag.out
@@ -1,3 +1,4 @@
+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
 0:? Sequence\r
 0:53  Function Definition: main( (void)\r

diff --git a/Test/baseResults/mains1.frag.out b/Test/baseResults/mains1.frag.out
index 9393d86..b8b4147 100644 (file)
--- a/Test/baseResults/mains1.frag.out
+++ b/Test/baseResults/mains1.frag.out
@@ -1,4 +1,5 @@
 mains1.frag\r
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 \r
 0:? Sequence\r
 0:3  Function Definition: main( (void)\r
@@ -6,6 +7,7 @@ mains1.frag
 0:?   Linker Objects\r
 \r
 mains2.frag\r
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 \r
 0:? Sequence\r
 0:3  Function Definition: main( (void)\r
@@ -14,6 +16,7 @@ mains2.frag
 \r
 noMain1.geom\r
 ERROR: #version: geometry shaders require non-es profile and version 150 or above\r
+Warning, version 150 is not yet complete; some version-specific are present, but many are missing.\r
 ERROR: 1 compilation errors.  No code generated.\r
 \r
 \r
@@ -23,6 +26,7 @@ ERROR: node is still EOpNull!
 0:?   Linker Objects\r
 \r
 noMain2.geom\r
+Warning, version 150 is not yet complete; some version-specific are present, but many are missing.\r
 \r
 0:? Sequence\r
 0:3  Function Definition: bar( (void)\r

diff --git a/Test/baseResults/matrix.frag.out b/Test/baseResults/matrix.frag.out
index 1f5914d..e3613ec 100644 (file)
--- a/Test/baseResults/matrix.frag.out
+++ b/Test/baseResults/matrix.frag.out
@@ -1,3 +1,4 @@
+Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 WARNING: 0:6: varying deprecated in version 130; may be removed in future release\r
 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

diff --git a/Test/baseResults/matrix2.frag.out b/Test/baseResults/matrix2.frag.out
index 0111378..f851587 100644 (file)
--- a/Test/baseResults/matrix2.frag.out
+++ b/Test/baseResults/matrix2.frag.out
@@ -1,3 +1,4 @@
+Warning, version 150 is not yet complete; some version-specific are present, but many are missing.\r
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release\r
 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

diff --git a/Test/baseResults/matrixError.vert.out b/Test/baseResults/matrixError.vert.out
index 4a6face..65f623e 100644 (file)
--- a/Test/baseResults/matrixError.vert.out
+++ b/Test/baseResults/matrixError.vert.out
@@ -1,3 +1,4 @@
+Warning, version 120 is not yet complete; most features are present, but a few are missing.\r
 ERROR: 0:10: 'constructor' : too many arguments \r
 ERROR: 0:7: '=' :  cannot assign to 'const 2X4 matrix of float'\r
 ERROR: 0:17: 'assign' :  cannot convert from '2-component vector of float' to '3-component vector of float'\r

diff --git a/Test/baseResults/newTexture.frag.out b/Test/baseResults/newTexture.frag.out
index 40613b1..fdfad50 100644 (file)
--- a/Test/baseResults/newTexture.frag.out
+++ b/Test/baseResults/newTexture.frag.out
@@ -1,3 +1,4 @@
+Warning, version 430 is not yet complete; some version-specific are present, but many are missing.\r
 0:? Sequence\r
 0:34  Function Definition: main( (void)\r
 0:34    Function Parameters: \r

diff --git a/Test/baseResults/nonSquare.vert.out b/Test/baseResults/nonSquare.vert.out
index 6b1961d..5257200 100644 (file)
--- a/Test/baseResults/nonSquare.vert.out
+++ b/Test/baseResults/nonSquare.vert.out
@@ -1,3 +1,4 @@
+Warning, version 120 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:15  Function Definition: main( (void)\r
 0:15    Function Parameters: \r

diff --git a/Test/baseResults/numeral.frag.out b/Test/baseResults/numeral.frag.out
index 99216ec..08de149 100644 (file)
--- a/Test/baseResults/numeral.frag.out
+++ b/Test/baseResults/numeral.frag.out
@@ -1,3 +1,4 @@
+Warning, version 400 is not yet complete; some version-specific are present, but many are missing.\r
 ERROR: 0:14: '' : octal literal digit too large \r
 ERROR: 0:15: '' : octal literal digit too large \r
 ERROR: 0:16: '' : octal literal digit too large \r

diff --git a/Test/baseResults/prepost.frag.out b/Test/baseResults/prepost.frag.out
index 337117d..71c41d3 100644 (file)
--- a/Test/baseResults/prepost.frag.out
+++ b/Test/baseResults/prepost.frag.out
@@ -1,3 +1,4 @@
+Warning, version 140 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:3  Function Definition: main( (void)\r
 0:3    Function Parameters: \r

diff --git a/Test/baseResults/recurse1.vert.out b/Test/baseResults/recurse1.vert.out
index e16d635..2748662 100644 (file)
--- a/Test/baseResults/recurse1.vert.out
+++ b/Test/baseResults/recurse1.vert.out
@@ -1,4 +1,5 @@
 recurse1.vert\r
+Warning, version 330 is not yet complete; some version-specific are present, but many are missing.\r
 \r
 0:? Sequence\r
 0:3  Function Definition: main( (void)\r
@@ -68,6 +69,7 @@ recurse1.vert
 0:?     'gl_InstanceID' (gl_InstanceId int)\r
 \r
 recurse1.frag\r
+Warning, version 330 is not yet complete; some version-specific are present, but many are missing.\r
 \r
 0:? Sequence\r
 0:5  Function Definition: main( (void)\r
@@ -102,6 +104,7 @@ recurse1.frag
 0:?   Linker Objects\r
 \r
 recurse2.frag\r
+Warning, version 330 is not yet complete; some version-specific are present, but many are missing.\r
 \r
 0:? Sequence\r
 0:9  Function Definition: cbar(i1; (float)\r

diff --git a/Test/baseResults/sample.frag.out b/Test/baseResults/sample.frag.out
index 0e85f8e..13c8679 100644 (file)
--- a/Test/baseResults/sample.frag.out
+++ b/Test/baseResults/sample.frag.out
@@ -1,3 +1,4 @@
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:38  Function Definition: main( (void)\r
 0:38    Function Parameters: \r

diff --git a/Test/baseResults/sample.vert.out b/Test/baseResults/sample.vert.out
index e7942be..29e3a05 100644 (file)
--- a/Test/baseResults/sample.vert.out
+++ b/Test/baseResults/sample.vert.out
@@ -1,3 +1,4 @@
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:38  Function Definition: main( (void)\r
 0:38    Function Parameters: \r

diff --git a/Test/baseResults/simpleFunctionCall.frag.out b/Test/baseResults/simpleFunctionCall.frag.out
index fa0bee7..f28c0d1 100644 (file)
--- a/Test/baseResults/simpleFunctionCall.frag.out
+++ b/Test/baseResults/simpleFunctionCall.frag.out
@@ -1,3 +1,4 @@
+Warning, version 150 is not yet complete; some version-specific are present, but many are missing.\r
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release\r
 0:? Sequence\r
 0:7  Function Definition: foo( (4-component vector of float)\r

diff --git a/Test/baseResults/specExamples.frag.out b/Test/baseResults/specExamples.frag.out
index d0f248c..0424442 100644 (file)
--- a/Test/baseResults/specExamples.frag.out
+++ b/Test/baseResults/specExamples.frag.out
@@ -1,3 +1,4 @@
+Warning, version 430 is not yet complete; some version-specific are present, but many are missing.\r
 ERROR: 0:6: '=' :  cannot convert from 'const uint' to 'int'\r
 ERROR: 0:20: '' : numeric literal too big \r
 ERROR: 0:21: '' : hexidecimal literal too big \r

diff --git a/Test/baseResults/specExamples.vert.out b/Test/baseResults/specExamples.vert.out
index c1b7c96..ea52fd5 100644 (file)
--- a/Test/baseResults/specExamples.vert.out
+++ b/Test/baseResults/specExamples.vert.out
@@ -1,3 +1,4 @@
+Warning, version 430 is not yet complete; some version-specific are present, but many are missing.\r
 ERROR: 0:5: 'Vertex' : only uniform interface blocks are supported \r
 ERROR: 0:10: 'Vertex2' : only uniform interface blocks are supported \r
 ERROR: 0:23: 'transforms' : redeclaration of array with size \r

diff --git a/Test/baseResults/structAssignment.frag.out b/Test/baseResults/structAssignment.frag.out
index 9ca8325..8dbb2e8 100644 (file)
--- a/Test/baseResults/structAssignment.frag.out
+++ b/Test/baseResults/structAssignment.frag.out
@@ -1,3 +1,4 @@
+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
 0:? Sequence\r
 0:29  Function Definition: main( (void)\r

diff --git a/Test/baseResults/structDeref.frag.out b/Test/baseResults/structDeref.frag.out
index a4d4c33..ea556ad 100644 (file)
--- a/Test/baseResults/structDeref.frag.out
+++ b/Test/baseResults/structDeref.frag.out
@@ -1,3 +1,4 @@
+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
 0:? Sequence\r
 0:41  Function Definition: main( (void)\r

diff --git a/Test/baseResults/structure.frag.out b/Test/baseResults/structure.frag.out
index f05893d..5d0719d 100644 (file)
--- a/Test/baseResults/structure.frag.out
+++ b/Test/baseResults/structure.frag.out
@@ -1,3 +1,4 @@
+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
 0:? Sequence\r
 0:20  Function Definition: main( (void)\r

diff --git a/Test/baseResults/swizzle.frag.out b/Test/baseResults/swizzle.frag.out
index e6b3a93..3f1b947 100644 (file)
--- a/Test/baseResults/swizzle.frag.out
+++ b/Test/baseResults/swizzle.frag.out
@@ -1,3 +1,4 @@
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:9  Function Definition: main( (void)\r
 0:9    Function Parameters: \r

diff --git a/Test/baseResults/syntaxError.frag.out b/Test/baseResults/syntaxError.frag.out
index 54df813..f8264de 100644 (file)
--- a/Test/baseResults/syntaxError.frag.out
+++ b/Test/baseResults/syntaxError.frag.out
@@ -1,3 +1,4 @@
+Warning, version 120 is not yet complete; most features are present, but a few are missing.\r
 ERROR: 0:9: 'vec5' : undeclared identifier \r
 ERROR: 0:9: '' :  syntax error\r
 ERROR: 2 compilation errors.  No code generated.\r

diff --git a/Test/baseResults/test.frag.out b/Test/baseResults/test.frag.out
index 74bf270..9e2a289 100644 (file)
--- a/Test/baseResults/test.frag.out
+++ b/Test/baseResults/test.frag.out
@@ -1,3 +1,4 @@
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:13  Function Definition: main( (void)\r
 0:13    Function Parameters: \r

diff --git a/Test/baseResults/texture.frag.out b/Test/baseResults/texture.frag.out
index 4a2738d..07f01f9 100644 (file)
--- a/Test/baseResults/texture.frag.out
+++ b/Test/baseResults/texture.frag.out
@@ -1,3 +1,4 @@
+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
 WARNING: 0:15: varying deprecated in version 130; may be removed in future release\r
 0:? Sequence\r

diff --git a/Test/baseResults/types.frag.out b/Test/baseResults/types.frag.out
index ee4164e..91b3f7f 100644 (file)
--- a/Test/baseResults/types.frag.out
+++ b/Test/baseResults/types.frag.out
@@ -1,3 +1,4 @@
+Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:33  Function Definition: main( (void)\r
 0:33    Function Parameters: \r

diff --git a/Test/baseResults/uniformArray.frag.out b/Test/baseResults/uniformArray.frag.out
index b8f1594..c71228d 100644 (file)
--- a/Test/baseResults/uniformArray.frag.out
+++ b/Test/baseResults/uniformArray.frag.out
@@ -1,3 +1,4 @@
+Warning, version 130 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:7  Function Definition: main( (void)\r
 0:7    Function Parameters: \r

diff --git a/Test/baseResults/variableArrayIndex.frag.out b/Test/baseResults/variableArrayIndex.frag.out
index 96db492..4a223b0 100644 (file)
--- a/Test/baseResults/variableArrayIndex.frag.out
+++ b/Test/baseResults/variableArrayIndex.frag.out
@@ -1,3 +1,4 @@
+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
 0:? Sequence\r
 0:29  Function Definition: main( (void)\r

diff --git a/Test/baseResults/varyingArray.frag.out b/Test/baseResults/varyingArray.frag.out
index aa905ac..73f7b90 100644 (file)
--- a/Test/baseResults/varyingArray.frag.out
+++ b/Test/baseResults/varyingArray.frag.out
@@ -1,3 +1,4 @@
+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
 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

diff --git a/Test/baseResults/varyingArrayIndirect.frag.out b/Test/baseResults/varyingArrayIndirect.frag.out
index 24b3582..8e60522 100644 (file)
--- a/Test/baseResults/varyingArrayIndirect.frag.out
+++ b/Test/baseResults/varyingArrayIndirect.frag.out
@@ -1,3 +1,4 @@
+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
 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

diff --git a/Test/baseResults/versionsClean.vert.out b/Test/baseResults/versionsClean.vert.out
index 259ad00..81bd78f 100644 (file)
--- a/Test/baseResults/versionsClean.vert.out
+++ b/Test/baseResults/versionsClean.vert.out
@@ -1,3 +1,4 @@
+Warning, version 420 is not yet complete; some version-specific are present, but many are missing.\r
 0:? Sequence\r
 0:40  Function Definition: main( (void)\r
 0:40    Function Parameters: \r

diff --git a/Test/baseResults/versionsErrors.frag.out b/Test/baseResults/versionsErrors.frag.out
index b339567..6a5f61a 100644 (file)
--- a/Test/baseResults/versionsErrors.frag.out
+++ b/Test/baseResults/versionsErrors.frag.out
@@ -1,4 +1,5 @@
 ERROR: #version: versions before 150 do not allow a profile token\r
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 ERROR: 0:38: 'attribute' : not supported in this stage: fragment\r
 ERROR: 0:40: 'sampler2DRect' : Reserved word. \r
 ERROR: 0:40: 'rectangle texture' : not supported for this version or the enabled extensions \r

diff --git a/Test/baseResults/versionsErrors.vert.out b/Test/baseResults/versionsErrors.vert.out
index 12ab775..3493e5d 100644 (file)
--- a/Test/baseResults/versionsErrors.vert.out
+++ b/Test/baseResults/versionsErrors.vert.out
@@ -1,3 +1,4 @@
+Warning, version 420 is not yet complete; some version-specific are present, but many are missing.\r
 WARNING: 0:38: attribute deprecated in version 130; may be removed in future release\r
 ERROR: 0:38: 'attribute' : no longer supported in core profile; removed in version 420\r
 ERROR: 0:45: 'discard' : not supported in this stage: vertex\r

diff --git a/Test/baseResults/voidFunction.frag.out b/Test/baseResults/voidFunction.frag.out
index 4b62cd2..5cc5d1e 100644 (file)
--- a/Test/baseResults/voidFunction.frag.out
+++ b/Test/baseResults/voidFunction.frag.out
@@ -1,3 +1,4 @@
+Warning, version 120 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:7  Sequence\r
 0:7    move second child to first child (float)\r

diff --git a/Test/baseResults/whileLoop.frag.out b/Test/baseResults/whileLoop.frag.out
index 7b25a0c..4300f18 100644 (file)
--- a/Test/baseResults/whileLoop.frag.out
+++ b/Test/baseResults/whileLoop.frag.out
@@ -1,3 +1,4 @@
+Warning, version 110 is not yet complete; most features are present, but a few are missing.\r
 0:? Sequence\r
 0:7  Function Definition: main( (void)\r
 0:7    Function Parameters: \r

diff --git a/glslang/MachineIndependent/ShaderLang.cpp b/glslang/MachineIndependent/ShaderLang.cpp
index 6b577c0..4a75e1a 100644 (file)
--- a/glslang/MachineIndependent/ShaderLang.cpp
+++ b/glslang/MachineIndependent/ShaderLang.cpp
@@ -74,11 +74,12 @@ int MapVersionToIndex(int version)
         case 410: return  9;
         case 420: return 10;
         case 430: return 11;
-        default:  //      |
+        case 440: return 12;
+        default:       // |
             return  0; // |
-        }         //      |
-}                 //      V
-const int VersionCount = 12;
+        }              // |
+}                      // V
+const int VersionCount = 13;  // number of case statements above
 
 // only one of these needed for non-ES; ES needs 2 for different precision defaults of built-ins
 enum EPrecisionClass {
@@ -359,6 +360,23 @@ bool DeduceVersionProfile(TInfoSink& infoSink, EShLanguage stage, bool versionNo
         infoSink.info.message(EPrefixError, "#version: statement must appear first in es-profile shader; before comments or newlines");
     }
 
+    // A metecheck on the condition the compiler itself...
+    switch(version) {
+    case 100:
+    case 300:
+        // versions are complete
+        break;
+    case 110:
+    case 120:
+    case 130:
+    case 140:
+        infoSink.info << "Warning, version " << version << " is not yet complete; most features are present, but a few are missing.\n";
+        break;
+    default:
+        infoSink.info << "Warning, version " << version << " is not yet complete; some version-specific are present, but many are missing.\n";
+        break;
+    }
+
     return correct;
 }