From 2dc568e31dfc9a73c4a023ec415c42a4e7a24628 Mon Sep 17 00:00:00 2001 From: Tom Gall Date: Fri, 14 Dec 2012 13:44:58 -0600 Subject: glsl, gles2: add glsl2/frag tests for gles2 This is a set of trivial changes. In the appropriate set of tests/glslparsertests/glsl2/*.frag which are targeted for glsl_version 1.10 or 1.20, add glsles_version: 1.00 which identifies the test as appropriate for glsl es 1.0 which lines up with gles2. --- tests/glslparsertest/glsl2/16384-consecutive-chars.frag | 1 + tests/glslparsertest/glsl2/16385-consecutive-chars.frag | 1 + tests/glslparsertest/glsl2/17000-consecutive-chars-identifier.frag | 1 + tests/glslparsertest/glsl2/array-length-110.frag | 1 + tests/glslparsertest/glsl2/bit-not-01.frag | 1 + tests/glslparsertest/glsl2/bit-not-02.frag | 1 + tests/glslparsertest/glsl2/bit-not-09.frag | 1 + tests/glslparsertest/glsl2/builtin-texturematrix.frag | 2 ++ tests/glslparsertest/glsl2/comment-continuation-preprocessor.frag | 1 + tests/glslparsertest/glsl2/const-builtin-110.frag | 1 + tests/glslparsertest/glsl2/const-builtin-noise1.frag | 1 + tests/glslparsertest/glsl2/const-builtin-noise2.frag | 1 + tests/glslparsertest/glsl2/const-builtin-noise3.frag | 1 + tests/glslparsertest/glsl2/const-builtin-noise4.frag | 1 + tests/glslparsertest/glsl2/const-implicit-conversion.frag | 2 ++ tests/glslparsertest/glsl2/const-mat-scalar-01.frag | 1 + tests/glslparsertest/glsl2/const-mat-scalar-02.frag | 1 + tests/glslparsertest/glsl2/const-mat-scalar-03.frag | 1 + tests/glslparsertest/glsl2/const-mat-scalar-04.frag | 1 + tests/glslparsertest/glsl2/const-matrix-multiply-01.frag | 1 + tests/glslparsertest/glsl2/const-matrix-multiply-02.frag | 6 ++++++ tests/glslparsertest/glsl2/const-userfunction.frag | 1 + tests/glslparsertest/glsl2/const-vec-mat.frag | 1 + tests/glslparsertest/glsl2/const-vec-scalar-01.frag | 1 + tests/glslparsertest/glsl2/const-vec-scalar-02.frag | 1 + tests/glslparsertest/glsl2/const-vec-scalar-03.frag | 1 + tests/glslparsertest/glsl2/const-vec-scalar-04.frag | 1 + tests/glslparsertest/glsl2/const-vec-scalar-05.frag | 1 + tests/glslparsertest/glsl2/draw_buffers-09.frag | 1 + tests/glslparsertest/glsl2/function-08.frag | 1 + tests/glslparsertest/glsl2/glsl-pp-elif-no-expression-2.frag | 1 + tests/glslparsertest/glsl2/local-function-01.frag | 1 + tests/glslparsertest/glsl2/local-function-02.frag | 1 + tests/glslparsertest/glsl2/local-function-03.frag | 3 +++ tests/glslparsertest/glsl2/logic-01.frag | 1 + tests/glslparsertest/glsl2/logic-02.frag | 1 + tests/glslparsertest/glsl2/loop-07.frag | 1 + tests/glslparsertest/glsl2/preprocessor-01.frag | 1 + tests/glslparsertest/glsl2/return-conversion-2.frag | 1 + tests/glslparsertest/glsl2/return-conversion.frag | 1 + tests/glslparsertest/glsl2/return-qualifier.frag | 1 + tests/glslparsertest/glsl2/sampler-01.frag | 1 + tests/glslparsertest/glsl2/sampler-02.frag | 1 + tests/glslparsertest/glsl2/sampler-03.frag | 1 + tests/glslparsertest/glsl2/sampler-04.frag | 1 + tests/glslparsertest/glsl2/sampler-05.frag | 1 + tests/glslparsertest/glsl2/sampler-06.frag | 1 + tests/glslparsertest/glsl2/scoping-01.frag | 1 + tests/glslparsertest/glsl2/scoping-02.frag | 1 + tests/glslparsertest/glsl2/struct-06.frag | 1 + tests/glslparsertest/glsl2/tex_lod-01.frag | 1 + tests/glslparsertest/glsl2/tex_lod-02.frag | 1 + tests/glslparsertest/glsl2/tex_lod-03.frag | 1 + tests/glslparsertest/glsl2/tex_lod-04.frag | 1 + tests/glslparsertest/glsl2/tex_lod-05.frag | 1 + tests/glslparsertest/glsl2/tex_lod-06.frag | 1 + tests/glslparsertest/glsl2/tex_lod-07.frag | 1 + tests/glslparsertest/glsl2/tex_lod-08.frag | 1 + tests/glslparsertest/glsl2/tex_lod-09.frag | 1 + tests/glslparsertest/glsl2/tex_lod-10.frag | 1 + tests/glslparsertest/glsl2/tex_lod-11.frag | 1 + tests/glslparsertest/glsl2/tex_lod-12.frag | 1 + tests/glslparsertest/glsl2/tex_lod-13.frag | 1 + tests/glslparsertest/glsl2/tex_rect-01.frag | 2 ++ tests/glslparsertest/glsl2/tex_rect-02.frag | 1 + tests/glslparsertest/glsl2/tex_rect-03.frag | 1 + tests/glslparsertest/glsl2/unary-plus.frag | 1 + tests/glslparsertest/glsl2/xreal-lighting-d-omni.frag | 1 + tests/glslparsertest/glsl2/xreal-lighting-db-omni.frag | 1 + tests/glslparsertest/glsl2/xreal-lighting-dbs-omni.frag | 1 + 70 files changed, 80 insertions(+) diff --git a/tests/glslparsertest/glsl2/16384-consecutive-chars.frag b/tests/glslparsertest/glsl2/16384-consecutive-chars.frag index 868267d4..d006fa76 100644 --- a/tests/glslparsertest/glsl2/16384-consecutive-chars.frag +++ b/tests/glslparsertest/glsl2/16384-consecutive-chars.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // [end config] /* 16384 consecutive characters without a newline. */ diff --git a/tests/glslparsertest/glsl2/16385-consecutive-chars.frag b/tests/glslparsertest/glsl2/16385-consecutive-chars.frag index 32fdaef7..91dbdedf 100644 --- a/tests/glslparsertest/glsl2/16385-consecutive-chars.frag +++ b/tests/glslparsertest/glsl2/16385-consecutive-chars.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // [end config] /* 16385 consecutive characters without a newline. */ diff --git a/tests/glslparsertest/glsl2/17000-consecutive-chars-identifier.frag b/tests/glslparsertest/glsl2/17000-consecutive-chars-identifier.frag index c1b0c493..1b2f0f9b 100644 --- a/tests/glslparsertest/glsl2/17000-consecutive-chars-identifier.frag +++ b/tests/glslparsertest/glsl2/17000-consecutive-chars-identifier.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // [end config] void main() { diff --git a/tests/glslparsertest/glsl2/array-length-110.frag b/tests/glslparsertest/glsl2/array-length-110.frag index 9302e00c..3aa27072 100644 --- a/tests/glslparsertest/glsl2/array-length-110.frag +++ b/tests/glslparsertest/glsl2/array-length-110.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/bit-not-01.frag b/tests/glslparsertest/glsl2/bit-not-01.frag index d64228e0..1a190027 100644 --- a/tests/glslparsertest/glsl2/bit-not-01.frag +++ b/tests/glslparsertest/glsl2/bit-not-01.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/bit-not-02.frag b/tests/glslparsertest/glsl2/bit-not-02.frag index 523b5f74..4d27c3a0 100644 --- a/tests/glslparsertest/glsl2/bit-not-02.frag +++ b/tests/glslparsertest/glsl2/bit-not-02.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.20 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/bit-not-09.frag b/tests/glslparsertest/glsl2/bit-not-09.frag index 4f3a6489..631c69ee 100644 --- a/tests/glslparsertest/glsl2/bit-not-09.frag +++ b/tests/glslparsertest/glsl2/bit-not-09.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.20 +// glsles_version: 1.00 // [end config] /* FAIL - bitwise operations aren't supported in 1.20. */ diff --git a/tests/glslparsertest/glsl2/builtin-texturematrix.frag b/tests/glslparsertest/glsl2/builtin-texturematrix.frag index 1edb50f8..23115f7b 100644 --- a/tests/glslparsertest/glsl2/builtin-texturematrix.frag +++ b/tests/glslparsertest/glsl2/builtin-texturematrix.frag @@ -1,6 +1,8 @@ // [config] // expect_result: pass +// glsles_expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/comment-continuation-preprocessor.frag b/tests/glslparsertest/glsl2/comment-continuation-preprocessor.frag index 4f84b0a2..e03495f4 100644 --- a/tests/glslparsertest/glsl2/comment-continuation-preprocessor.frag +++ b/tests/glslparsertest/glsl2/comment-continuation-preprocessor.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.20 +// glsles_version: 1.00 // // [end config] // diff --git a/tests/glslparsertest/glsl2/const-builtin-110.frag b/tests/glslparsertest/glsl2/const-builtin-110.frag index 53e21cd9..b0a58eb1 100644 --- a/tests/glslparsertest/glsl2/const-builtin-110.frag +++ b/tests/glslparsertest/glsl2/const-builtin-110.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/const-builtin-noise1.frag b/tests/glslparsertest/glsl2/const-builtin-noise1.frag index 1fc9281f..5f8149fa 100644 --- a/tests/glslparsertest/glsl2/const-builtin-noise1.frag +++ b/tests/glslparsertest/glsl2/const-builtin-noise1.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.20 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/const-builtin-noise2.frag b/tests/glslparsertest/glsl2/const-builtin-noise2.frag index 56442f2b..73e03489 100644 --- a/tests/glslparsertest/glsl2/const-builtin-noise2.frag +++ b/tests/glslparsertest/glsl2/const-builtin-noise2.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.20 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/const-builtin-noise3.frag b/tests/glslparsertest/glsl2/const-builtin-noise3.frag index 5a45e0a5..cf5ec3de 100644 --- a/tests/glslparsertest/glsl2/const-builtin-noise3.frag +++ b/tests/glslparsertest/glsl2/const-builtin-noise3.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.20 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/const-builtin-noise4.frag b/tests/glslparsertest/glsl2/const-builtin-noise4.frag index 960547e5..c65d44b3 100644 --- a/tests/glslparsertest/glsl2/const-builtin-noise4.frag +++ b/tests/glslparsertest/glsl2/const-builtin-noise4.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.20 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/const-implicit-conversion.frag b/tests/glslparsertest/glsl2/const-implicit-conversion.frag index 04118119..65358743 100644 --- a/tests/glslparsertest/glsl2/const-implicit-conversion.frag +++ b/tests/glslparsertest/glsl2/const-implicit-conversion.frag @@ -1,6 +1,8 @@ // [config] // expect_result: pass +// glsles_expect_result: fail // glsl_version: 1.20 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/const-mat-scalar-01.frag b/tests/glslparsertest/glsl2/const-mat-scalar-01.frag index c037cdb1..ff802b57 100644 --- a/tests/glslparsertest/glsl2/const-mat-scalar-01.frag +++ b/tests/glslparsertest/glsl2/const-mat-scalar-01.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/const-mat-scalar-02.frag b/tests/glslparsertest/glsl2/const-mat-scalar-02.frag index 22d7cfef..92a2f5b0 100644 --- a/tests/glslparsertest/glsl2/const-mat-scalar-02.frag +++ b/tests/glslparsertest/glsl2/const-mat-scalar-02.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/const-mat-scalar-03.frag b/tests/glslparsertest/glsl2/const-mat-scalar-03.frag index f8668ae4..59706f18 100644 --- a/tests/glslparsertest/glsl2/const-mat-scalar-03.frag +++ b/tests/glslparsertest/glsl2/const-mat-scalar-03.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/const-mat-scalar-04.frag b/tests/glslparsertest/glsl2/const-mat-scalar-04.frag index 7bcdeb8e..aa87c728 100644 --- a/tests/glslparsertest/glsl2/const-mat-scalar-04.frag +++ b/tests/glslparsertest/glsl2/const-mat-scalar-04.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/const-matrix-multiply-01.frag b/tests/glslparsertest/glsl2/const-matrix-multiply-01.frag index 4eade7cc..addd38e4 100644 --- a/tests/glslparsertest/glsl2/const-matrix-multiply-01.frag +++ b/tests/glslparsertest/glsl2/const-matrix-multiply-01.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/const-matrix-multiply-02.frag b/tests/glslparsertest/glsl2/const-matrix-multiply-02.frag index 71bc1e09..9889b944 100644 --- a/tests/glslparsertest/glsl2/const-matrix-multiply-02.frag +++ b/tests/glslparsertest/glsl2/const-matrix-multiply-02.frag @@ -1,13 +1,19 @@ // [config] // expect_result: pass // glsl_version: 1.20 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision // # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0 // [end config] +#ifndef GL_ES #version 120 +#else +#version 100 +#endif + void main() { const mat3x2 c1 = mat3x2(1.0, 2.0, 3.0, 4.0, 5.0, 6.0); diff --git a/tests/glslparsertest/glsl2/const-userfunction.frag b/tests/glslparsertest/glsl2/const-userfunction.frag index 6c3bcc2b..8db60195 100644 --- a/tests/glslparsertest/glsl2/const-userfunction.frag +++ b/tests/glslparsertest/glsl2/const-userfunction.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.20 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/const-vec-mat.frag b/tests/glslparsertest/glsl2/const-vec-mat.frag index d7bed88a..e5d1c7fb 100644 --- a/tests/glslparsertest/glsl2/const-vec-mat.frag +++ b/tests/glslparsertest/glsl2/const-vec-mat.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/const-vec-scalar-01.frag b/tests/glslparsertest/glsl2/const-vec-scalar-01.frag index f4957a29..c9920b39 100644 --- a/tests/glslparsertest/glsl2/const-vec-scalar-01.frag +++ b/tests/glslparsertest/glsl2/const-vec-scalar-01.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/const-vec-scalar-02.frag b/tests/glslparsertest/glsl2/const-vec-scalar-02.frag index a5f665da..760b79b9 100644 --- a/tests/glslparsertest/glsl2/const-vec-scalar-02.frag +++ b/tests/glslparsertest/glsl2/const-vec-scalar-02.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/const-vec-scalar-03.frag b/tests/glslparsertest/glsl2/const-vec-scalar-03.frag index 5b158822..9f7d00fc 100644 --- a/tests/glslparsertest/glsl2/const-vec-scalar-03.frag +++ b/tests/glslparsertest/glsl2/const-vec-scalar-03.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/const-vec-scalar-04.frag b/tests/glslparsertest/glsl2/const-vec-scalar-04.frag index 148e14ba..0f085e89 100644 --- a/tests/glslparsertest/glsl2/const-vec-scalar-04.frag +++ b/tests/glslparsertest/glsl2/const-vec-scalar-04.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/const-vec-scalar-05.frag b/tests/glslparsertest/glsl2/const-vec-scalar-05.frag index c92e76ee..ac7f3cd6 100644 --- a/tests/glslparsertest/glsl2/const-vec-scalar-05.frag +++ b/tests/glslparsertest/glsl2/const-vec-scalar-05.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.20 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/draw_buffers-09.frag b/tests/glslparsertest/glsl2/draw_buffers-09.frag index e0484195..a8608ff1 100644 --- a/tests/glslparsertest/glsl2/draw_buffers-09.frag +++ b/tests/glslparsertest/glsl2/draw_buffers-09.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/function-08.frag b/tests/glslparsertest/glsl2/function-08.frag index ccdccdc6..d784ae08 100644 --- a/tests/glslparsertest/glsl2/function-08.frag +++ b/tests/glslparsertest/glsl2/function-08.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/glsl-pp-elif-no-expression-2.frag b/tests/glslparsertest/glsl2/glsl-pp-elif-no-expression-2.frag index 3ac3add5..0eb2a9a1 100644 --- a/tests/glslparsertest/glsl2/glsl-pp-elif-no-expression-2.frag +++ b/tests/glslparsertest/glsl2/glsl-pp-elif-no-expression-2.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/local-function-01.frag b/tests/glslparsertest/glsl2/local-function-01.frag index 0ceb4c9c..beaa0991 100644 --- a/tests/glslparsertest/glsl2/local-function-01.frag +++ b/tests/glslparsertest/glsl2/local-function-01.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.20 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/local-function-02.frag b/tests/glslparsertest/glsl2/local-function-02.frag index dc52f57b..d5c67bfc 100644 --- a/tests/glslparsertest/glsl2/local-function-02.frag +++ b/tests/glslparsertest/glsl2/local-function-02.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.20 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/local-function-03.frag b/tests/glslparsertest/glsl2/local-function-03.frag index 1ee171c2..5c470618 100644 --- a/tests/glslparsertest/glsl2/local-function-03.frag +++ b/tests/glslparsertest/glsl2/local-function-03.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision @@ -8,7 +9,9 @@ // [end config] /* PASS - local function declarations are not allowed in GLSL 1.10. */ +#ifndef GL_ES #version 110 +#endif void main() { float foo(float x); gl_FragColor = vec4(0.0, foo(0.5), 0.0, 1.0); diff --git a/tests/glslparsertest/glsl2/logic-01.frag b/tests/glslparsertest/glsl2/logic-01.frag index 334213ba..48e87d61 100644 --- a/tests/glslparsertest/glsl2/logic-01.frag +++ b/tests/glslparsertest/glsl2/logic-01.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // [end config] /* Test short circuit evaluation: though the second argument isn't necessary diff --git a/tests/glslparsertest/glsl2/logic-02.frag b/tests/glslparsertest/glsl2/logic-02.frag index 198a54ed..91f85ef3 100644 --- a/tests/glslparsertest/glsl2/logic-02.frag +++ b/tests/glslparsertest/glsl2/logic-02.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // [end config] /* Test short circuit evaluation: though the second argument isn't necessary diff --git a/tests/glslparsertest/glsl2/loop-07.frag b/tests/glslparsertest/glsl2/loop-07.frag index 7ff9da45..598af9fb 100644 --- a/tests/glslparsertest/glsl2/loop-07.frag +++ b/tests/glslparsertest/glsl2/loop-07.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // [end config] void main() diff --git a/tests/glslparsertest/glsl2/preprocessor-01.frag b/tests/glslparsertest/glsl2/preprocessor-01.frag index a8bc55d5..f9a9bd22 100644 --- a/tests/glslparsertest/glsl2/preprocessor-01.frag +++ b/tests/glslparsertest/glsl2/preprocessor-01.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/return-conversion-2.frag b/tests/glslparsertest/glsl2/return-conversion-2.frag index 5d9ce79c..f97c28aa 100644 --- a/tests/glslparsertest/glsl2/return-conversion-2.frag +++ b/tests/glslparsertest/glsl2/return-conversion-2.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/return-conversion.frag b/tests/glslparsertest/glsl2/return-conversion.frag index a0be87a5..e7bf8419 100644 --- a/tests/glslparsertest/glsl2/return-conversion.frag +++ b/tests/glslparsertest/glsl2/return-conversion.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/return-qualifier.frag b/tests/glslparsertest/glsl2/return-qualifier.frag index 886d5435..9ad8e2ba 100644 --- a/tests/glslparsertest/glsl2/return-qualifier.frag +++ b/tests/glslparsertest/glsl2/return-qualifier.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/sampler-01.frag b/tests/glslparsertest/glsl2/sampler-01.frag index a6c54d2e..1c8e40e2 100644 --- a/tests/glslparsertest/glsl2/sampler-01.frag +++ b/tests/glslparsertest/glsl2/sampler-01.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/sampler-02.frag b/tests/glslparsertest/glsl2/sampler-02.frag index 62c03e50..2be2af28 100644 --- a/tests/glslparsertest/glsl2/sampler-02.frag +++ b/tests/glslparsertest/glsl2/sampler-02.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/sampler-03.frag b/tests/glslparsertest/glsl2/sampler-03.frag index e4a94d13..e46aa4c3 100644 --- a/tests/glslparsertest/glsl2/sampler-03.frag +++ b/tests/glslparsertest/glsl2/sampler-03.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/sampler-04.frag b/tests/glslparsertest/glsl2/sampler-04.frag index 22b1b244..2c81931b 100644 --- a/tests/glslparsertest/glsl2/sampler-04.frag +++ b/tests/glslparsertest/glsl2/sampler-04.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/sampler-05.frag b/tests/glslparsertest/glsl2/sampler-05.frag index 45cdf13c..bb4e4f36 100644 --- a/tests/glslparsertest/glsl2/sampler-05.frag +++ b/tests/glslparsertest/glsl2/sampler-05.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/sampler-06.frag b/tests/glslparsertest/glsl2/sampler-06.frag index 76a2bbfb..ad2ec672 100644 --- a/tests/glslparsertest/glsl2/sampler-06.frag +++ b/tests/glslparsertest/glsl2/sampler-06.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/scoping-01.frag b/tests/glslparsertest/glsl2/scoping-01.frag index d95fba78..042d4b8c 100644 --- a/tests/glslparsertest/glsl2/scoping-01.frag +++ b/tests/glslparsertest/glsl2/scoping-01.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/scoping-02.frag b/tests/glslparsertest/glsl2/scoping-02.frag index b9f0774c..36518d93 100644 --- a/tests/glslparsertest/glsl2/scoping-02.frag +++ b/tests/glslparsertest/glsl2/scoping-02.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/struct-06.frag b/tests/glslparsertest/glsl2/struct-06.frag index 21dc7997..49db844d 100644 --- a/tests/glslparsertest/glsl2/struct-06.frag +++ b/tests/glslparsertest/glsl2/struct-06.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/tex_lod-01.frag b/tests/glslparsertest/glsl2/tex_lod-01.frag index 9be11ba5..641093e6 100644 --- a/tests/glslparsertest/glsl2/tex_lod-01.frag +++ b/tests/glslparsertest/glsl2/tex_lod-01.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/tex_lod-02.frag b/tests/glslparsertest/glsl2/tex_lod-02.frag index f957360e..25d5d7a9 100644 --- a/tests/glslparsertest/glsl2/tex_lod-02.frag +++ b/tests/glslparsertest/glsl2/tex_lod-02.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/tex_lod-03.frag b/tests/glslparsertest/glsl2/tex_lod-03.frag index 0918db64..d535e8ce 100644 --- a/tests/glslparsertest/glsl2/tex_lod-03.frag +++ b/tests/glslparsertest/glsl2/tex_lod-03.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/tex_lod-04.frag b/tests/glslparsertest/glsl2/tex_lod-04.frag index fe195639..96383c1b 100644 --- a/tests/glslparsertest/glsl2/tex_lod-04.frag +++ b/tests/glslparsertest/glsl2/tex_lod-04.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/tex_lod-05.frag b/tests/glslparsertest/glsl2/tex_lod-05.frag index 3c6cf283..a55f53fb 100644 --- a/tests/glslparsertest/glsl2/tex_lod-05.frag +++ b/tests/glslparsertest/glsl2/tex_lod-05.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/tex_lod-06.frag b/tests/glslparsertest/glsl2/tex_lod-06.frag index b50304f4..2bd99894 100644 --- a/tests/glslparsertest/glsl2/tex_lod-06.frag +++ b/tests/glslparsertest/glsl2/tex_lod-06.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/tex_lod-07.frag b/tests/glslparsertest/glsl2/tex_lod-07.frag index 819b5d8a..6794168c 100644 --- a/tests/glslparsertest/glsl2/tex_lod-07.frag +++ b/tests/glslparsertest/glsl2/tex_lod-07.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/tex_lod-08.frag b/tests/glslparsertest/glsl2/tex_lod-08.frag index ed989b89..0a644a7e 100644 --- a/tests/glslparsertest/glsl2/tex_lod-08.frag +++ b/tests/glslparsertest/glsl2/tex_lod-08.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/tex_lod-09.frag b/tests/glslparsertest/glsl2/tex_lod-09.frag index 13cbdbde..9a503b81 100644 --- a/tests/glslparsertest/glsl2/tex_lod-09.frag +++ b/tests/glslparsertest/glsl2/tex_lod-09.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/tex_lod-10.frag b/tests/glslparsertest/glsl2/tex_lod-10.frag index e337d2bb..5c2f803e 100644 --- a/tests/glslparsertest/glsl2/tex_lod-10.frag +++ b/tests/glslparsertest/glsl2/tex_lod-10.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/tex_lod-11.frag b/tests/glslparsertest/glsl2/tex_lod-11.frag index 6bc5d1f5..d176ee10 100644 --- a/tests/glslparsertest/glsl2/tex_lod-11.frag +++ b/tests/glslparsertest/glsl2/tex_lod-11.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/tex_lod-12.frag b/tests/glslparsertest/glsl2/tex_lod-12.frag index 7a43cc69..1e7b8244 100644 --- a/tests/glslparsertest/glsl2/tex_lod-12.frag +++ b/tests/glslparsertest/glsl2/tex_lod-12.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/tex_lod-13.frag b/tests/glslparsertest/glsl2/tex_lod-13.frag index 6b3ec4b3..be5b29fe 100644 --- a/tests/glslparsertest/glsl2/tex_lod-13.frag +++ b/tests/glslparsertest/glsl2/tex_lod-13.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/tex_rect-01.frag b/tests/glslparsertest/glsl2/tex_rect-01.frag index bdddb499..bb37c816 100644 --- a/tests/glslparsertest/glsl2/tex_rect-01.frag +++ b/tests/glslparsertest/glsl2/tex_rect-01.frag @@ -1,6 +1,8 @@ // [config] // expect_result: pass +// glsles_expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/tex_rect-02.frag b/tests/glslparsertest/glsl2/tex_rect-02.frag index 9a51cef1..29cc70f0 100644 --- a/tests/glslparsertest/glsl2/tex_rect-02.frag +++ b/tests/glslparsertest/glsl2/tex_rect-02.frag @@ -1,6 +1,7 @@ // [config] // expect_result: fail // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/tex_rect-03.frag b/tests/glslparsertest/glsl2/tex_rect-03.frag index ab2376ad..0f4dfa64 100644 --- a/tests/glslparsertest/glsl2/tex_rect-03.frag +++ b/tests/glslparsertest/glsl2/tex_rect-03.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/unary-plus.frag b/tests/glslparsertest/glsl2/unary-plus.frag index 1d418411..67cee53e 100644 --- a/tests/glslparsertest/glsl2/unary-plus.frag +++ b/tests/glslparsertest/glsl2/unary-plus.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/xreal-lighting-d-omni.frag b/tests/glslparsertest/glsl2/xreal-lighting-d-omni.frag index e386e5b0..5bd24df9 100644 --- a/tests/glslparsertest/glsl2/xreal-lighting-d-omni.frag +++ b/tests/glslparsertest/glsl2/xreal-lighting-d-omni.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/xreal-lighting-db-omni.frag b/tests/glslparsertest/glsl2/xreal-lighting-db-omni.frag index e6e512fb..016ce645 100644 --- a/tests/glslparsertest/glsl2/xreal-lighting-db-omni.frag +++ b/tests/glslparsertest/glsl2/xreal-lighting-db-omni.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision diff --git a/tests/glslparsertest/glsl2/xreal-lighting-dbs-omni.frag b/tests/glslparsertest/glsl2/xreal-lighting-dbs-omni.frag index 5e087970..74f44cea 100644 --- a/tests/glslparsertest/glsl2/xreal-lighting-dbs-omni.frag +++ b/tests/glslparsertest/glsl2/xreal-lighting-dbs-omni.frag @@ -1,6 +1,7 @@ // [config] // expect_result: pass // glsl_version: 1.10 +// glsles_version: 1.00 // // # NOTE: Config section was auto-generated from file // # NOTE: 'glslparser.tests' at git revision -- cgit v1.2.3