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.
Signed-off-by: Tom Gall <[email protected]> --- tests/glslparsertest/shaders/CorrectConstFolding1.vert | 2 ++ tests/glslparsertest/shaders/CorrectConstFolding2.vert | 2 ++ tests/glslparsertest/shaders/CorrectConstruct.vert | 2 ++ tests/glslparsertest/shaders/CorrectFull.vert | 2 ++ tests/glslparsertest/shaders/CorrectFuncOverload.vert | 1 + tests/glslparsertest/shaders/CorrectFunction.vert | 2 ++ tests/glslparsertest/shaders/CorrectFunction1.vert | 1 + tests/glslparsertest/shaders/CorrectParse2.vert | 1 + tests/glslparsertest/shaders/CorrectSwizzle1.vert | 2 ++ tests/glslparsertest/shaders/CorrectSwizzle2.vert | 1 + tests/glslparsertest/shaders/FunctionParam.vert | 1 + tests/glslparsertest/shaders/MainParameters.vert | 1 + tests/glslparsertest/shaders/attribute.vert | 1 + tests/glslparsertest/shaders/attribute1.vert | 1 + tests/glslparsertest/shaders/attribute2.vert | 1 + tests/glslparsertest/shaders/comma1.vert | 1 + tests/glslparsertest/shaders/comma2.vert | 1 + tests/glslparsertest/shaders/comma3.vert | 1 + tests/glslparsertest/shaders/fragmentOnly.vert | 1 + tests/glslparsertest/shaders/fragmentOnly1.vert | 1 + tests/glslparsertest/shaders/fragmentOnly2.vert | 1 + tests/glslparsertest/shaders/fragmentOnly3.vert | 1 + tests/glslparsertest/shaders/fragmentOnly4.vert | 1 + tests/glslparsertest/shaders/main1.vert | 1 + tests/glslparsertest/shaders/main2.vert | 1 + tests/glslparsertest/shaders/main3.vert | 1 + tests/glslparsertest/shaders/normal.vert | 1 + tests/glslparsertest/shaders/parser1.vert | 1 + tests/glslparsertest/shaders/vertex.vert | 1 + 29 files changed, 35 insertions(+) diff --git a/tests/glslparsertest/shaders/CorrectConstFolding1.vert b/tests/glslparsertest/shaders/CorrectConstFolding1.vert index d50f960..36d423a 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 10526aa..e53a4e2 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 a5c3646..e59404b 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 7a56f46..b6db786 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 097cdf0..e72448b 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 b8873b3..bcb872a 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 83f32ed..e79ae8f 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 68fc51b..aa937cf 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 fd6b50a..4aa753d 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 d763ccf..e93d1a5 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 687e30b..87c79eb 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 2ecc583..d6c9109 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 30bee98..4e4d4cf 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 bd69f98..e37685e 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 8dc8438..25c6ec6 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 91d95f9..e2a9713 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 43e71ab..09d8826 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 863ec78..620de9b 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 2248a5a..941fe68 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 b91b7cc..4ce5489 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 fcbd1be..12125b7 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 3cbb27f..db31a92 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 e847dd2..261628e 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 6559dfb..44807ab 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 f236144..9eaf567 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 c2fdbe1..285c74c 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 f3727cd..9a0493a 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 aca3e6c..eb2b4ea 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 be4897f..52e7158 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 -- 1.7.10.4 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
