aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gall <tom.gall@linaro.org>2012-12-14 13:40:55 -0600
committerTom Gall <tom.gall@linaro.org>2013-01-23 14:08:49 -0600
commit388b44dbd273aebece1b31a323564a4dc73d0b68 (patch)
treee247851dbfc47f7c0be2c2f95ed045bea7d450d0
parentff3983079c44baa5063a113e5ba855062c062af3 (diff)
downloadpiglit-388b44dbd273aebece1b31a323564a4dc73d0b68.tar.gz
glsl, gles2: add shader/vert tests for gles2
This is a set of trivial changes. In the appropriate set of tests/glslparsertests/shaders/*.vert which are targeted for glsl_version 1.10 or 1.20, add glsles_version: 1.00 which identifies the test as also appropriate for glsl es 1.0.
-rw-r--r--tests/glslparsertest/shaders/CorrectConstFolding1.vert2
-rw-r--r--tests/glslparsertest/shaders/CorrectConstFolding2.vert2
-rw-r--r--tests/glslparsertest/shaders/CorrectConstruct.vert2
-rw-r--r--tests/glslparsertest/shaders/CorrectFull.vert2
-rw-r--r--tests/glslparsertest/shaders/CorrectFuncOverload.vert1
-rw-r--r--tests/glslparsertest/shaders/CorrectFunction.vert2
-rw-r--r--tests/glslparsertest/shaders/CorrectFunction1.vert1
-rw-r--r--tests/glslparsertest/shaders/CorrectParse2.vert1
-rw-r--r--tests/glslparsertest/shaders/CorrectSwizzle1.vert2
-rw-r--r--tests/glslparsertest/shaders/CorrectSwizzle2.vert1
-rw-r--r--tests/glslparsertest/shaders/FunctionParam.vert1
-rw-r--r--tests/glslparsertest/shaders/MainParameters.vert1
-rw-r--r--tests/glslparsertest/shaders/attribute.vert1
-rw-r--r--tests/glslparsertest/shaders/attribute1.vert1
-rw-r--r--tests/glslparsertest/shaders/attribute2.vert1
-rw-r--r--tests/glslparsertest/shaders/comma1.vert1
-rw-r--r--tests/glslparsertest/shaders/comma2.vert1
-rw-r--r--tests/glslparsertest/shaders/comma3.vert1
-rw-r--r--tests/glslparsertest/shaders/fragmentOnly.vert1
-rw-r--r--tests/glslparsertest/shaders/fragmentOnly1.vert1
-rw-r--r--tests/glslparsertest/shaders/fragmentOnly2.vert1
-rw-r--r--tests/glslparsertest/shaders/fragmentOnly3.vert1
-rw-r--r--tests/glslparsertest/shaders/fragmentOnly4.vert1
-rw-r--r--tests/glslparsertest/shaders/main1.vert1
-rw-r--r--tests/glslparsertest/shaders/main2.vert1
-rw-r--r--tests/glslparsertest/shaders/main3.vert1
-rw-r--r--tests/glslparsertest/shaders/normal.vert1
-rw-r--r--tests/glslparsertest/shaders/parser1.vert1
-rw-r--r--tests/glslparsertest/shaders/vertex.vert1
29 files changed, 35 insertions, 0 deletions
diff --git a/tests/glslparsertest/shaders/CorrectConstFolding1.vert b/tests/glslparsertest/shaders/CorrectConstFolding1.vert
index d50f9607..36d423a2 100644
--- a/tests/glslparsertest/shaders/CorrectConstFolding1.vert
+++ b/tests/glslparsertest/shaders/CorrectConstFolding1.vert
@@ -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/shaders/CorrectConstFolding2.vert b/tests/glslparsertest/shaders/CorrectConstFolding2.vert
index 10526aa2..e53a4e27 100644
--- a/tests/glslparsertest/shaders/CorrectConstFolding2.vert
+++ b/tests/glslparsertest/shaders/CorrectConstFolding2.vert
@@ -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/shaders/CorrectConstruct.vert b/tests/glslparsertest/shaders/CorrectConstruct.vert
index a5c36466..e59404ba 100644
--- a/tests/glslparsertest/shaders/CorrectConstruct.vert
+++ b/tests/glslparsertest/shaders/CorrectConstruct.vert
@@ -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/shaders/CorrectFull.vert b/tests/glslparsertest/shaders/CorrectFull.vert
index 7a56f463..b6db786a 100644
--- a/tests/glslparsertest/shaders/CorrectFull.vert
+++ b/tests/glslparsertest/shaders/CorrectFull.vert
@@ -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/shaders/CorrectFuncOverload.vert b/tests/glslparsertest/shaders/CorrectFuncOverload.vert
index 097cdf08..e72448b2 100644
--- a/tests/glslparsertest/shaders/CorrectFuncOverload.vert
+++ b/tests/glslparsertest/shaders/CorrectFuncOverload.vert
@@ -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/shaders/CorrectFunction.vert b/tests/glslparsertest/shaders/CorrectFunction.vert
index b8873b35..bcb872a5 100644
--- a/tests/glslparsertest/shaders/CorrectFunction.vert
+++ b/tests/glslparsertest/shaders/CorrectFunction.vert
@@ -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/shaders/CorrectFunction1.vert b/tests/glslparsertest/shaders/CorrectFunction1.vert
index 83f32eda..e79ae8fa 100644
--- a/tests/glslparsertest/shaders/CorrectFunction1.vert
+++ b/tests/glslparsertest/shaders/CorrectFunction1.vert
@@ -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/shaders/CorrectParse2.vert b/tests/glslparsertest/shaders/CorrectParse2.vert
index 68fc51bb..aa937cfb 100644
--- a/tests/glslparsertest/shaders/CorrectParse2.vert
+++ b/tests/glslparsertest/shaders/CorrectParse2.vert
@@ -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/shaders/CorrectSwizzle1.vert b/tests/glslparsertest/shaders/CorrectSwizzle1.vert
index fd6b50ab..4aa753d1 100644
--- a/tests/glslparsertest/shaders/CorrectSwizzle1.vert
+++ b/tests/glslparsertest/shaders/CorrectSwizzle1.vert
@@ -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/shaders/CorrectSwizzle2.vert b/tests/glslparsertest/shaders/CorrectSwizzle2.vert
index d763ccf8..e93d1a5f 100644
--- a/tests/glslparsertest/shaders/CorrectSwizzle2.vert
+++ b/tests/glslparsertest/shaders/CorrectSwizzle2.vert
@@ -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/shaders/FunctionParam.vert b/tests/glslparsertest/shaders/FunctionParam.vert
index 687e30bd..87c79eba 100644
--- a/tests/glslparsertest/shaders/FunctionParam.vert
+++ b/tests/glslparsertest/shaders/FunctionParam.vert
@@ -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/shaders/MainParameters.vert b/tests/glslparsertest/shaders/MainParameters.vert
index 2ecc5831..d6c91090 100644
--- a/tests/glslparsertest/shaders/MainParameters.vert
+++ b/tests/glslparsertest/shaders/MainParameters.vert
@@ -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/shaders/attribute.vert b/tests/glslparsertest/shaders/attribute.vert
index 30bee985..4e4d4cfd 100644
--- a/tests/glslparsertest/shaders/attribute.vert
+++ b/tests/glslparsertest/shaders/attribute.vert
@@ -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/shaders/attribute1.vert b/tests/glslparsertest/shaders/attribute1.vert
index bd69f982..e37685e9 100644
--- a/tests/glslparsertest/shaders/attribute1.vert
+++ b/tests/glslparsertest/shaders/attribute1.vert
@@ -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/shaders/attribute2.vert b/tests/glslparsertest/shaders/attribute2.vert
index 8dc8438f..25c6ec66 100644
--- a/tests/glslparsertest/shaders/attribute2.vert
+++ b/tests/glslparsertest/shaders/attribute2.vert
@@ -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/shaders/comma1.vert b/tests/glslparsertest/shaders/comma1.vert
index 91d95f92..e2a97135 100644
--- a/tests/glslparsertest/shaders/comma1.vert
+++ b/tests/glslparsertest/shaders/comma1.vert
@@ -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/shaders/comma2.vert b/tests/glslparsertest/shaders/comma2.vert
index 43e71ab4..09d88260 100644
--- a/tests/glslparsertest/shaders/comma2.vert
+++ b/tests/glslparsertest/shaders/comma2.vert
@@ -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/shaders/comma3.vert b/tests/glslparsertest/shaders/comma3.vert
index 863ec780..620de9be 100644
--- a/tests/glslparsertest/shaders/comma3.vert
+++ b/tests/glslparsertest/shaders/comma3.vert
@@ -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/shaders/fragmentOnly.vert b/tests/glslparsertest/shaders/fragmentOnly.vert
index 2248a5af..941fe688 100644
--- a/tests/glslparsertest/shaders/fragmentOnly.vert
+++ b/tests/glslparsertest/shaders/fragmentOnly.vert
@@ -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/shaders/fragmentOnly1.vert b/tests/glslparsertest/shaders/fragmentOnly1.vert
index b91b7cc4..4ce54891 100644
--- a/tests/glslparsertest/shaders/fragmentOnly1.vert
+++ b/tests/glslparsertest/shaders/fragmentOnly1.vert
@@ -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/shaders/fragmentOnly2.vert b/tests/glslparsertest/shaders/fragmentOnly2.vert
index fcbd1be7..12125b7c 100644
--- a/tests/glslparsertest/shaders/fragmentOnly2.vert
+++ b/tests/glslparsertest/shaders/fragmentOnly2.vert
@@ -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/shaders/fragmentOnly3.vert b/tests/glslparsertest/shaders/fragmentOnly3.vert
index 3cbb27f1..db31a926 100644
--- a/tests/glslparsertest/shaders/fragmentOnly3.vert
+++ b/tests/glslparsertest/shaders/fragmentOnly3.vert
@@ -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/shaders/fragmentOnly4.vert b/tests/glslparsertest/shaders/fragmentOnly4.vert
index e847dd2b..261628eb 100644
--- a/tests/glslparsertest/shaders/fragmentOnly4.vert
+++ b/tests/glslparsertest/shaders/fragmentOnly4.vert
@@ -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/shaders/main1.vert b/tests/glslparsertest/shaders/main1.vert
index 6559dfbd..44807aba 100644
--- a/tests/glslparsertest/shaders/main1.vert
+++ b/tests/glslparsertest/shaders/main1.vert
@@ -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/shaders/main2.vert b/tests/glslparsertest/shaders/main2.vert
index f2361449..9eaf567c 100644
--- a/tests/glslparsertest/shaders/main2.vert
+++ b/tests/glslparsertest/shaders/main2.vert
@@ -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/shaders/main3.vert b/tests/glslparsertest/shaders/main3.vert
index c2fdbe12..285c74cc 100644
--- a/tests/glslparsertest/shaders/main3.vert
+++ b/tests/glslparsertest/shaders/main3.vert
@@ -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/shaders/normal.vert b/tests/glslparsertest/shaders/normal.vert
index f3727cd2..9a0493af 100644
--- a/tests/glslparsertest/shaders/normal.vert
+++ b/tests/glslparsertest/shaders/normal.vert
@@ -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/shaders/parser1.vert b/tests/glslparsertest/shaders/parser1.vert
index aca3e6cf..eb2b4ea3 100644
--- a/tests/glslparsertest/shaders/parser1.vert
+++ b/tests/glslparsertest/shaders/parser1.vert
@@ -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/shaders/vertex.vert b/tests/glslparsertest/shaders/vertex.vert
index be4897fd..52e7158b 100644
--- a/tests/glslparsertest/shaders/vertex.vert
+++ b/tests/glslparsertest/shaders/vertex.vert
@@ -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