[Piglit] [PATCH 6/6] glsl, gles2: add glsl2/frag tests for gles2
Tom Gall
tom.gall at linaro.org
Wed Dec 19 06:43:30 PST 2012
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.
Signed-off-by: Tom Gall <tom.gall at linaro.org>
---
tests/glslparsertest/glsl2/16384-consecutive-chars.frag | 1 +
tests/glslparsertest/glsl2/16385-consecutive-chars.frag | 1 +
.../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 ++
.../glslparsertest/glsl2/comment-continuation-preprocessor.frag | 1 +
tests/glslparsertest/glsl2/comment-continuation.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 +
71 files changed, 81 insertions(+)
diff --git a/tests/glslparsertest/glsl2/16384-consecutive-chars.frag b/tests/glslparsertest/glsl2/16384-consecutive-chars.frag
index 868267d..d006fa7 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 32fdaef..91dbded 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 c1b0c49..1b2f0f9 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 9302e00..3aa2707 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 d64228e..1a19002 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 523b5f7..4d27c3a 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 4f3a648..631c69e 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 1edb50f..23115f7 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 4f84b0a..e03495f 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/comment-continuation.frag b/tests/glslparsertest/glsl2/comment-continuation.frag
index ea39796..a868e75 100644
--- a/tests/glslparsertest/glsl2/comment-continuation.frag
+++ b/tests/glslparsertest/glsl2/comment-continuation.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-builtin-110.frag b/tests/glslparsertest/glsl2/const-builtin-110.frag
index 53e21cd..b0a58eb 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 1fc9281..5f8149f 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 56442f2..73e0348 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 5a45e0a..cf5ec3d 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 960547e..c65d44b 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 0411811..6535874 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 c037cdb..ff802b5 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 22d7cfe..92a2f5b 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 f8668ae..59706f1 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 7bcdeb8..aa87c72 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 4eade7c..addd38e 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 71bc1e0..9889b94 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 6c3bcc2..8db6019 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 d7bed88..e5d1c7f 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 f4957a2..c9920b3 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 a5f665d..760b79b 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 5b15882..9f7d00f 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 148e14b..0f085e8 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 c92e76e..ac7f3cd 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 e048419..a8608ff 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 ccdccdc..d784ae0 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 3ac3add..0eb2a9a 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 0ceb4c9..beaa099 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 dc52f57..d5c67bf 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 1ee171c..5c47061 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 334213b..48e87d6 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 198a54e..91f85ef 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 7ff9da4..598af9f 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 a8bc55d..f9a9bd2 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 5d9ce79..f97c28a 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 a0be87a..e7bf841 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 886d543..9ad8e2b 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 a6c54d2..1c8e40e 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 62c03e5..2be2af2 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 e4a94d1..e46aa4c 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 22b1b24..2c81931 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 45cdf13..bb4e4f3 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 76a2bbf..ad2ec67 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 d95fba7..042d4b8 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 b9f0774..36518d9 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 21dc799..49db844 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 9be11ba..641093e 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 f957360..25d5d7a 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 0918db6..d535e8c 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 fe19563..96383c1 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 3c6cf28..a55f53f 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 b50304f..2bd9989 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 819b5d8..6794168 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 ed989b8..0a644a7 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 13cbdbd..9a503b8 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 e337d2b..5c2f803 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 6bc5d1f..d176ee1 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 7a43cc6..1e7b824 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 6b3ec4b..be5b29f 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 bdddb49..bb37c81 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 9a51cef..29cc70f 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 ab2376a..0f4dfa6 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 1d41841..67cee53 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 e386e5b..5bd24df 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 e6e512f..016ce64 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 5e08797..74f44ce 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
--
1.7.10.4
More information about the Piglit
mailing list