diff --git a/Test/baseResults/120.frag.out b/Test/baseResults/120.frag.out index a396c842..f48f2d2c 100644 --- 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. ERROR: 0:9: 'in for stage inputs' : not supported for this version or the enabled extensions ERROR: 0:10: 'out for stage outputs' : not supported for this version or the enabled extensions 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) diff --git a/Test/baseResults/120.vert.out b/Test/baseResults/120.vert.out index f0395f3a..735fdb30 100644 --- 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. ERROR: 0:3: 'in for stage inputs' : not supported for this version or the enabled extensions ERROR: 0:4: 'out for stage outputs' : not supported for this version or the enabled extensions ERROR: 0:11: 'gl_Position' : cannot add storage, auxiliary, memory, interpolation, or precision qualifier to an existing variable diff --git a/Test/baseResults/130.frag.out b/Test/baseResults/130.frag.out index b1eada0d..5ed70486 100644 --- 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. 0:? Sequence 0:16 Function Definition: main( (void) 0:16 Function Parameters: diff --git a/Test/baseResults/140.frag.out b/Test/baseResults/140.frag.out index 15a238ee..8dc506c5 100644 --- 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. WARNING: 0:3: varying deprecated in version 130; may be removed in future release ERROR: 0:14: '#error' : GL_ES is not set ERROR: 1 compilation errors. No code generated. diff --git a/Test/baseResults/330.frag.out b/Test/baseResults/330.frag.out index 8e5906b9..d9d0bbf3 100644 --- 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. WARNING: 0:6: varying deprecated in version 130; may be removed in future release 0:? Sequence 0:8 Function Definition: main( (void) diff --git a/Test/baseResults/330comp.frag.out b/Test/baseResults/330comp.frag.out index 1917bb47..9a76d4f4 100644 --- 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. 0:? Sequence 0:8 Function Definition: main( (void) 0:8 Function Parameters: diff --git a/Test/baseResults/400.frag.out b/Test/baseResults/400.frag.out index df37e93e..eec0658c 100644 --- 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. ERROR: 0:11: 'variable indexing sampler array' : not supported for this version or the enabled extensions ERROR: 1 compilation errors. No code generated. diff --git a/Test/baseResults/400.geom.out b/Test/baseResults/400.geom.out index 88769fde..d27f7ad9 100644 --- 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. 0:? Sequence 0:3 Function Definition: main( (void) 0:3 Function Parameters: diff --git a/Test/baseResults/400.tesc.out b/Test/baseResults/400.tesc.out index 05a8a20e..f356a5fe 100644 --- 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. 0:? Sequence 0:3 Function Definition: main( (void) 0:3 Function Parameters: diff --git a/Test/baseResults/400.tese.out b/Test/baseResults/400.tese.out index 033c6421..e369c8ff 100644 --- 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. ERROR: 0:5: 'barrier' : no matching overloaded function found ERROR: 1 compilation errors. No code generated. diff --git a/Test/baseResults/420.tese.out b/Test/baseResults/420.tese.out index f44d24c3..bf47c370 100644 --- 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. 0:? Sequence 0:3 Function Definition: main( (void) 0:3 Function Parameters: diff --git a/Test/baseResults/420.vert.out b/Test/baseResults/420.vert.out index 01bfda7f..373af19f 100644 --- 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. WARNING: 0:3: varying deprecated in version 130; may be removed in future release ERROR: 0:3: 'varying' : no longer supported in core profile; removed in version 420 ERROR: 0:7: '' : vertex input cannot be further qualified diff --git a/Test/baseResults/430.comp.out b/Test/baseResults/430.comp.out index feac3c36..834791b9 100644 --- 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. 0:? Sequence 0:3 Function Definition: main( (void) 0:3 Function Parameters: diff --git a/Test/baseResults/430scope.vert.out b/Test/baseResults/430scope.vert.out index 7a42aa71..4c600de2 100644 --- 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. ERROR: 0:5: 'a' : redefinition ERROR: 0:17: 'b' : illegal redeclaration ERROR: 0:19: 'f' : redefinition diff --git a/Test/baseResults/Operations.frag.out b/Test/baseResults/Operations.frag.out index f882301c..434df498 100644 --- 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. 0:? Sequence 0:15 Function Definition: main( (void) 0:15 Function Parameters: diff --git a/Test/baseResults/aggOps.frag.out b/Test/baseResults/aggOps.frag.out index 5ce73238..c2f1a63c 100644 --- 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. WARNING: 0:4: varying deprecated in version 130; may be removed in future release WARNING: 0:6: varying deprecated in version 130; may be removed in future release 0:? Sequence diff --git a/Test/baseResults/always-discard.frag.out b/Test/baseResults/always-discard.frag.out index 579e3ec5..76055e5f 100644 --- 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. 0:? Sequence 0:4 Function Definition: main( (void) 0:4 Function Parameters: diff --git a/Test/baseResults/always-discard2.frag.out b/Test/baseResults/always-discard2.frag.out index 401fab76..724c8aec 100644 --- 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. 0:? Sequence 0:4 Function Definition: main( (void) 0:4 Function Parameters: diff --git a/Test/baseResults/array.frag.out b/Test/baseResults/array.frag.out index eac07366..b87a9bf0 100644 --- 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. ERROR: 0:21: '[' : array index out of range '2' ERROR: 0:27: '[' : array must be redeclared with a size before being indexed with a variable ERROR: 0:30: 'assign' : cannot convert from '4-element array of float' to '5-element array of float' diff --git a/Test/baseResults/comment.frag.out b/Test/baseResults/comment.frag.out index 5f748f10..5084e36d 100644 --- 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. 0:? Sequence 0:17 Function Definition: main( (void) 0:17 Function Parameters: diff --git a/Test/baseResults/conditionalDiscard.frag.out b/Test/baseResults/conditionalDiscard.frag.out index a4c3e6c2..1d3359b9 100644 --- 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. 0:? Sequence 0:6 Function Definition: main( (void) 0:6 Function Parameters: diff --git a/Test/baseResults/constErrors.frag.out b/Test/baseResults/constErrors.frag.out index 692529e9..14c9a7ab 100644 --- 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. ERROR: 0:14: '=' : assigning non-constant to 'const int' ERROR: 0:17: '' : constant expression required ERROR: 0:17: '' : array size must be a constant integer expression diff --git a/Test/baseResults/constFold.frag.out b/Test/baseResults/constFold.frag.out index 539a3316..22cf44fa 100644 --- 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. 0:? Sequence 0:28 Function Definition: main( (void) 0:28 Function Parameters: diff --git a/Test/baseResults/conversion.frag.out b/Test/baseResults/conversion.frag.out index 2379ea17..ec3d2f6d 100644 --- 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. 0:? Sequence 0:33 Function Definition: main( (void) 0:33 Function Parameters: diff --git a/Test/baseResults/cppIndent.vert.out b/Test/baseResults/cppIndent.vert.out index 221640e4..93c643a7 100644 --- 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. 0:? Sequence 0:5 Sequence 0:5 move second child to first child (float) diff --git a/Test/baseResults/cppNest.vert.out b/Test/baseResults/cppNest.vert.out index 918f832e..60255be6 100644 --- 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. 0:? Sequence 0:5 Sequence 0:5 move second child to first child (float) diff --git a/Test/baseResults/cppSimple.vert.out b/Test/baseResults/cppSimple.vert.out index 89201f1a..48dfcff9 100644 --- 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. ERROR: 0:77: '#error' : good1 ERROR: 0:81: '#error' : good2 ERROR: 0:85: '#error' : good3 diff --git a/Test/baseResults/dataOut.frag.out b/Test/baseResults/dataOut.frag.out index f23cfc36..a57aec36 100644 --- 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. WARNING: 0:3: varying deprecated in version 130; may be removed in future release 0:? Sequence 0:5 Function Definition: main( (void) diff --git a/Test/baseResults/dataOutIndirect.frag.out b/Test/baseResults/dataOutIndirect.frag.out index 5a6f27d5..5e18a6a6 100644 --- 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. WARNING: 0:3: varying deprecated in version 130; may be removed in future release 0:? Sequence 0:7 Function Definition: main( (void) diff --git a/Test/baseResults/dce.frag.out b/Test/baseResults/dce.frag.out index 06ffadaa..9d800f66 100644 --- 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. 0:? Sequence 0:5 Sequence 0:5 move second child to first child (int) diff --git a/Test/baseResults/decls.frag.out b/Test/baseResults/decls.frag.out index f965ed91..6e11cfff 100644 --- 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. ERROR: 0:19: 'vi4' : illegal use of type 'void' ERROR: 0:20: 'vj' : illegal use of type 'void' ERROR: 0:20: 'vk5' : illegal use of type 'void' diff --git a/Test/baseResults/deepRvalue.frag.out b/Test/baseResults/deepRvalue.frag.out index 2591dec4..e1e59757 100644 --- 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. 0:? Sequence 0:5 Sequence 0:5 move second child to first child (4-component vector of float) diff --git a/Test/baseResults/depthOut.frag.out b/Test/baseResults/depthOut.frag.out index 77c448a4..dc2bd1c1 100644 --- 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. WARNING: 0:3: varying deprecated in version 130; may be removed in future release WARNING: 0:4: varying deprecated in version 130; may be removed in future release 0:? Sequence diff --git a/Test/baseResults/discard-dce.frag.out b/Test/baseResults/discard-dce.frag.out index 97f012bc..6cc24a01 100644 --- 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. 0:? Sequence 0:4 Function Definition: main( (void) 0:4 Function Parameters: diff --git a/Test/baseResults/doWhileLoop.frag.out b/Test/baseResults/doWhileLoop.frag.out index 32956c44..7071474e 100644 --- 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. 0:? Sequence 0:7 Function Definition: main( (void) 0:7 Function Parameters: diff --git a/Test/baseResults/earlyReturnDiscard.frag.out b/Test/baseResults/earlyReturnDiscard.frag.out index 288f55ef..3b6144be 100644 --- 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. 0:? Sequence 0:19 Function Definition: main( (void) 0:19 Function Parameters: diff --git a/Test/baseResults/flowControl.frag.out b/Test/baseResults/flowControl.frag.out index 606671d1..d237e726 100644 --- 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. 0:? Sequence 0:10 Function Definition: main( (void) 0:10 Function Parameters: diff --git a/Test/baseResults/forLoop.frag.out b/Test/baseResults/forLoop.frag.out index 5db7911f..4fec5793 100644 --- 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. 0:? Sequence 0:8 Function Definition: main( (void) 0:8 Function Parameters: diff --git a/Test/baseResults/forwardRef.frag.out b/Test/baseResults/forwardRef.frag.out index d63454a9..6ea65d76 100644 --- 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. 0:? Sequence 0:11 Function Definition: main( (void) 0:11 Function Parameters: diff --git a/Test/baseResults/functionCall.frag.out b/Test/baseResults/functionCall.frag.out index 2257197e..e9a8af92 100644 --- 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. WARNING: 0:4: varying deprecated in version 130; may be removed in future release 0:? Sequence 0:7 Sequence diff --git a/Test/baseResults/length.frag.out b/Test/baseResults/length.frag.out index f7f53ac7..c4438c55 100644 --- 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. 0:? Sequence 0:11 Function Definition: main( (void) 0:11 Function Parameters: diff --git a/Test/baseResults/link1.frag.out b/Test/baseResults/link1.frag.out index 06d1d4a6..d6e8d8de 100644 --- a/Test/baseResults/link1.frag.out +++ b/Test/baseResults/link1.frag.out @@ -1,4 +1,5 @@ link1.frag +Warning, version 130 is not yet complete; most features are present, but a few are missing. 0:? Sequence 0:8 Sequence @@ -79,6 +80,7 @@ link1.frag 0:? 3.900000 link2.frag +Warning, version 130 is not yet complete; most features are present, but a few are missing. 0:? Sequence 0:8 Sequence diff --git a/Test/baseResults/localAggregates.frag.out b/Test/baseResults/localAggregates.frag.out index 4ee071d6..bf638b39 100644 --- 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. WARNING: 0:4: varying deprecated in version 130; may be removed in future release WARNING: 0:5: varying deprecated in version 130; may be removed in future release 0:? Sequence diff --git a/Test/baseResults/loops.frag.out b/Test/baseResults/loops.frag.out index 3937067b..64cb1312 100644 --- 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. WARNING: 0:14: varying deprecated in version 130; may be removed in future release 0:? Sequence 0:53 Function Definition: main( (void) diff --git a/Test/baseResults/loopsArtificial.frag.out b/Test/baseResults/loopsArtificial.frag.out index d63d8ed6..ec6ec79d 100644 --- 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. WARNING: 0:14: varying deprecated in version 130; may be removed in future release 0:? Sequence 0:53 Function Definition: main( (void) diff --git a/Test/baseResults/mains1.frag.out b/Test/baseResults/mains1.frag.out index 9393d863..b8b4147b 100644 --- a/Test/baseResults/mains1.frag.out +++ b/Test/baseResults/mains1.frag.out @@ -1,4 +1,5 @@ mains1.frag +Warning, version 110 is not yet complete; most features are present, but a few are missing. 0:? Sequence 0:3 Function Definition: main( (void) @@ -6,6 +7,7 @@ mains1.frag 0:? Linker Objects mains2.frag +Warning, version 110 is not yet complete; most features are present, but a few are missing. 0:? Sequence 0:3 Function Definition: main( (void) @@ -14,6 +16,7 @@ mains2.frag noMain1.geom ERROR: #version: geometry shaders require non-es profile and version 150 or above +Warning, version 150 is not yet complete; some version-specific are present, but many are missing. ERROR: 1 compilation errors. No code generated. @@ -23,6 +26,7 @@ ERROR: node is still EOpNull! 0:? Linker Objects noMain2.geom +Warning, version 150 is not yet complete; some version-specific are present, but many are missing. 0:? Sequence 0:3 Function Definition: bar( (void) diff --git a/Test/baseResults/matrix.frag.out b/Test/baseResults/matrix.frag.out index 1f5914d6..e3613eca 100644 --- 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. WARNING: 0:6: varying deprecated in version 130; may be removed in future release WARNING: 0:17: varying deprecated in version 130; may be removed in future release WARNING: 0:22: varying deprecated in version 130; may be removed in future release diff --git a/Test/baseResults/matrix2.frag.out b/Test/baseResults/matrix2.frag.out index 0111378a..f8515874 100644 --- 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. WARNING: 0:4: varying deprecated in version 130; may be removed in future release WARNING: 0:13: varying deprecated in version 130; may be removed in future release WARNING: 0:15: varying deprecated in version 130; may be removed in future release diff --git a/Test/baseResults/matrixError.vert.out b/Test/baseResults/matrixError.vert.out index 4a6face7..65f623e4 100644 --- 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. ERROR: 0:10: 'constructor' : too many arguments ERROR: 0:7: '=' : cannot assign to 'const 2X4 matrix of float' ERROR: 0:17: 'assign' : cannot convert from '2-component vector of float' to '3-component vector of float' diff --git a/Test/baseResults/newTexture.frag.out b/Test/baseResults/newTexture.frag.out index 40613b1d..fdfad500 100644 --- 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. 0:? Sequence 0:34 Function Definition: main( (void) 0:34 Function Parameters: diff --git a/Test/baseResults/nonSquare.vert.out b/Test/baseResults/nonSquare.vert.out index 6b1961dd..5257200f 100644 --- 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. 0:? Sequence 0:15 Function Definition: main( (void) 0:15 Function Parameters: diff --git a/Test/baseResults/numeral.frag.out b/Test/baseResults/numeral.frag.out index 99216ece..08de1494 100644 --- 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. ERROR: 0:14: '' : octal literal digit too large ERROR: 0:15: '' : octal literal digit too large ERROR: 0:16: '' : octal literal digit too large diff --git a/Test/baseResults/prepost.frag.out b/Test/baseResults/prepost.frag.out index 337117de..71c41d3f 100644 --- 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. 0:? Sequence 0:3 Function Definition: main( (void) 0:3 Function Parameters: diff --git a/Test/baseResults/recurse1.vert.out b/Test/baseResults/recurse1.vert.out index e16d6354..2748662e 100644 --- a/Test/baseResults/recurse1.vert.out +++ b/Test/baseResults/recurse1.vert.out @@ -1,4 +1,5 @@ recurse1.vert +Warning, version 330 is not yet complete; some version-specific are present, but many are missing. 0:? Sequence 0:3 Function Definition: main( (void) @@ -68,6 +69,7 @@ recurse1.vert 0:? 'gl_InstanceID' (gl_InstanceId int) recurse1.frag +Warning, version 330 is not yet complete; some version-specific are present, but many are missing. 0:? Sequence 0:5 Function Definition: main( (void) @@ -102,6 +104,7 @@ recurse1.frag 0:? Linker Objects recurse2.frag +Warning, version 330 is not yet complete; some version-specific are present, but many are missing. 0:? Sequence 0:9 Function Definition: cbar(i1; (float) diff --git a/Test/baseResults/sample.frag.out b/Test/baseResults/sample.frag.out index 0e85f8e9..13c8679c 100644 --- 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. 0:? Sequence 0:38 Function Definition: main( (void) 0:38 Function Parameters: diff --git a/Test/baseResults/sample.vert.out b/Test/baseResults/sample.vert.out index e7942be4..29e3a05c 100644 --- 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. 0:? Sequence 0:38 Function Definition: main( (void) 0:38 Function Parameters: diff --git a/Test/baseResults/simpleFunctionCall.frag.out b/Test/baseResults/simpleFunctionCall.frag.out index fa0bee76..f28c0d13 100644 --- 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. WARNING: 0:4: varying deprecated in version 130; may be removed in future release 0:? Sequence 0:7 Function Definition: foo( (4-component vector of float) diff --git a/Test/baseResults/specExamples.frag.out b/Test/baseResults/specExamples.frag.out index d0f248c0..04244425 100644 --- 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. ERROR: 0:6: '=' : cannot convert from 'const uint' to 'int' ERROR: 0:20: '' : numeric literal too big ERROR: 0:21: '' : hexidecimal literal too big diff --git a/Test/baseResults/specExamples.vert.out b/Test/baseResults/specExamples.vert.out index c1b7c965..ea52fd5b 100644 --- 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. ERROR: 0:5: 'Vertex' : only uniform interface blocks are supported ERROR: 0:10: 'Vertex2' : only uniform interface blocks are supported ERROR: 0:23: 'transforms' : redeclaration of array with size diff --git a/Test/baseResults/structAssignment.frag.out b/Test/baseResults/structAssignment.frag.out index 9ca8325c..8dbb2e89 100644 --- 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. WARNING: 0:4: varying deprecated in version 130; may be removed in future release 0:? Sequence 0:29 Function Definition: main( (void) diff --git a/Test/baseResults/structDeref.frag.out b/Test/baseResults/structDeref.frag.out index a4d4c33d..ea556adf 100644 --- 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. WARNING: 0:4: varying deprecated in version 130; may be removed in future release 0:? Sequence 0:41 Function Definition: main( (void) diff --git a/Test/baseResults/structure.frag.out b/Test/baseResults/structure.frag.out index f05893df..5d0719d2 100644 --- 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. WARNING: 0:3: varying deprecated in version 130; may be removed in future release 0:? Sequence 0:20 Function Definition: main( (void) diff --git a/Test/baseResults/swizzle.frag.out b/Test/baseResults/swizzle.frag.out index e6b3a934..3f1b9471 100644 --- 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. 0:? Sequence 0:9 Function Definition: main( (void) 0:9 Function Parameters: diff --git a/Test/baseResults/syntaxError.frag.out b/Test/baseResults/syntaxError.frag.out index 54df8139..f8264de0 100644 --- 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. ERROR: 0:9: 'vec5' : undeclared identifier ERROR: 0:9: '' : syntax error ERROR: 2 compilation errors. No code generated. diff --git a/Test/baseResults/test.frag.out b/Test/baseResults/test.frag.out index 74bf2708..9e2a2891 100644 --- 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. 0:? Sequence 0:13 Function Definition: main( (void) 0:13 Function Parameters: diff --git a/Test/baseResults/texture.frag.out b/Test/baseResults/texture.frag.out index 4a2738d8..07f01f9b 100644 --- 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. WARNING: 0:14: varying deprecated in version 130; may be removed in future release WARNING: 0:15: varying deprecated in version 130; may be removed in future release 0:? Sequence diff --git a/Test/baseResults/types.frag.out b/Test/baseResults/types.frag.out index ee4164ed..91b3f7f0 100644 --- 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. 0:? Sequence 0:33 Function Definition: main( (void) 0:33 Function Parameters: diff --git a/Test/baseResults/uniformArray.frag.out b/Test/baseResults/uniformArray.frag.out index b8f15949..c71228da 100644 --- 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. 0:? Sequence 0:7 Function Definition: main( (void) 0:7 Function Parameters: diff --git a/Test/baseResults/variableArrayIndex.frag.out b/Test/baseResults/variableArrayIndex.frag.out index 96db492f..4a223b09 100644 --- 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. WARNING: 0:3: varying deprecated in version 130; may be removed in future release 0:? Sequence 0:29 Function Definition: main( (void) diff --git a/Test/baseResults/varyingArray.frag.out b/Test/baseResults/varyingArray.frag.out index aa905ace..73f7b906 100644 --- 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. WARNING: 0:3: varying deprecated in version 130; may be removed in future release WARNING: 0:4: varying deprecated in version 130; may be removed in future release WARNING: 0:6: varying deprecated in version 130; may be removed in future release diff --git a/Test/baseResults/varyingArrayIndirect.frag.out b/Test/baseResults/varyingArrayIndirect.frag.out index 24b35829..8e605226 100644 --- 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. WARNING: 0:3: varying deprecated in version 130; may be removed in future release WARNING: 0:4: varying deprecated in version 130; may be removed in future release WARNING: 0:6: varying deprecated in version 130; may be removed in future release diff --git a/Test/baseResults/versionsClean.vert.out b/Test/baseResults/versionsClean.vert.out index 259ad00d..81bd78fd 100644 --- 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. 0:? Sequence 0:40 Function Definition: main( (void) 0:40 Function Parameters: diff --git a/Test/baseResults/versionsErrors.frag.out b/Test/baseResults/versionsErrors.frag.out index b339567b..6a5f61a3 100644 --- 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 +Warning, version 110 is not yet complete; most features are present, but a few are missing. ERROR: 0:38: 'attribute' : not supported in this stage: fragment ERROR: 0:40: 'sampler2DRect' : Reserved word. ERROR: 0:40: 'rectangle texture' : not supported for this version or the enabled extensions diff --git a/Test/baseResults/versionsErrors.vert.out b/Test/baseResults/versionsErrors.vert.out index 12ab7757..3493e5d9 100644 --- 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. WARNING: 0:38: attribute deprecated in version 130; may be removed in future release ERROR: 0:38: 'attribute' : no longer supported in core profile; removed in version 420 ERROR: 0:45: 'discard' : not supported in this stage: vertex diff --git a/Test/baseResults/voidFunction.frag.out b/Test/baseResults/voidFunction.frag.out index 4b62cd21..5cc5d1ee 100644 --- 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. 0:? Sequence 0:7 Sequence 0:7 move second child to first child (float) diff --git a/Test/baseResults/whileLoop.frag.out b/Test/baseResults/whileLoop.frag.out index 7b25a0c3..4300f181 100644 --- 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. 0:? Sequence 0:7 Function Definition: main( (void) 0:7 Function Parameters: diff --git a/glslang/MachineIndependent/ShaderLang.cpp b/glslang/MachineIndependent/ShaderLang.cpp index 6b577c07..4a75e1a3 100644 --- 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; }