On Thu, Jan 23, 2014 at 11:55 PM, Jordan Justen <[email protected]> wrote: > Signed-off-by: Jordan Justen <[email protected]> > --- > .../incorrect-in-layout-qualifier-column_major.geom | 20 > ++++++++++++++++++++ > .../incorrect-in-layout-qualifier-max_vertices.geom | 20 > ++++++++++++++++++++ > .../incorrect-in-layout-qualifier-packed.geom | 20 > ++++++++++++++++++++ > .../incorrect-in-layout-qualifier-repeated-prim.geom | 20 > ++++++++++++++++++++ > .../incorrect-in-layout-qualifier-row_major.geom | 20 > ++++++++++++++++++++ > .../incorrect-in-layout-qualifier-shared.geom | 20 > ++++++++++++++++++++ > .../incorrect-in-layout-qualifier-std140.geom | 20 > ++++++++++++++++++++ > 7 files changed, 140 insertions(+) > create mode 100644 > tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-column_major.geom > create mode 100644 > tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-max_vertices.geom > create mode 100644 > tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-packed.geom > create mode 100644 > tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-repeated-prim.geom > create mode 100644 > tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-row_major.geom > create mode 100644 > tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-shared.geom > create mode 100644 > tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-std140.geom > > diff --git > a/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-column_major.geom > > b/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-column_major.geom > new file mode 100644 > index 0000000..e697d25 > --- /dev/null > +++ > b/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-column_major.geom > @@ -0,0 +1,20 @@ > +// [config] > +// expect_result: fail > +// glsl_version: 1.50 > +// check_link: false > +// [end config] > +// > +// Tests for invalid input layout qualifiers. > +// > +// GLSLangSpec 1.50, section 4.3.8.1 (Input Layout Qualifiers): > +// "Only one argument is accepted. For example, > +// layout(triangles) in;" > +// > + > +#version 150 > + > +layout(points, column_major) in; > + > +void main() > +{ > +} > diff --git > a/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-max_vertices.geom > > b/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-max_vertices.geom > new file mode 100644 > index 0000000..d3b47fb > --- /dev/null > +++ > b/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-max_vertices.geom > @@ -0,0 +1,20 @@ > +// [config] > +// expect_result: fail > +// glsl_version: 1.50 > +// check_link: false > +// [end config] > +// > +// Tests for invalid input layout qualifiers. > +// > +// GLSLangSpec 1.50, section 4.3.8.1 (Input Layout Qualifiers): > +// "Only one argument is accepted. For example, > +// layout(triangles) in;" > +// > + > +#version 150 > + > +layout(points, max_vertices=1) in; > + > +void main() > +{ > +} > diff --git > a/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-packed.geom > b/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-packed.geom > new file mode 100644 > index 0000000..f280490 > --- /dev/null > +++ b/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-packed.geom > @@ -0,0 +1,20 @@ > +// [config] > +// expect_result: fail > +// glsl_version: 1.50 > +// check_link: false > +// [end config] > +// > +// Tests for invalid input layout qualifiers. > +// > +// GLSLangSpec 1.50, section 4.3.8.1 (Input Layout Qualifiers): > +// "Only one argument is accepted. For example, > +// layout(triangles) in;" > +// > + > +#version 150 > + > +layout(points, packed) in; > + > +void main() > +{ > +} > diff --git > a/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-repeated-prim.geom > > b/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-repeated-prim.geom > new file mode 100644 > index 0000000..129bbe3 > --- /dev/null > +++ > b/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-repeated-prim.geom > @@ -0,0 +1,20 @@ > +// [config] > +// expect_result: fail > +// glsl_version: 1.50 > +// check_link: false > +// [end config] > +// > +// Tests for invalid input layout qualifiers. > +// > +// GLSLangSpec 1.50, section 4.3.8.1 (Input Layout Qualifiers): > +// "Only one argument is accepted. For example, > +// layout(triangles) in;" > +// > + > +#version 150 > + > +layout(points, points) in; > + > +void main() > +{ > +} > diff --git > a/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-row_major.geom > b/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-row_major.geom > new file mode 100644 > index 0000000..620de87 > --- /dev/null > +++ > b/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-row_major.geom > @@ -0,0 +1,20 @@ > +// [config] > +// expect_result: fail > +// glsl_version: 1.50 > +// check_link: false > +// [end config] > +// > +// Tests for invalid input layout qualifiers. > +// > +// GLSLangSpec 1.50, section 4.3.8.1 (Input Layout Qualifiers): > +// "Only one argument is accepted. For example, > +// layout(triangles) in;" > +// > + > +#version 150 > + > +layout(points, row_major) in; > + > +void main() > +{ > +} > diff --git > a/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-shared.geom > b/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-shared.geom > new file mode 100644 > index 0000000..96d0206 > --- /dev/null > +++ b/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-shared.geom > @@ -0,0 +1,20 @@ > +// [config] > +// expect_result: fail > +// glsl_version: 1.50 > +// check_link: false > +// [end config] > +// > +// Tests for invalid input layout qualifiers. > +// > +// GLSLangSpec 1.50, section 4.3.8.1 (Input Layout Qualifiers): > +// "Only one argument is accepted. For example, > +// layout(triangles) in;" > +// > + > +#version 150 > + > +layout(points, shared) in; > + > +void main() > +{ > +} > diff --git > a/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-std140.geom > b/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-std140.geom > new file mode 100644 > index 0000000..64a6eb8 > --- /dev/null > +++ b/tests/spec/glsl-1.50/compiler/incorrect-in-layout-qualifier-std140.geom > @@ -0,0 +1,20 @@ > +// [config] > +// expect_result: fail > +// glsl_version: 1.50 > +// check_link: false > +// [end config] > +// > +// Tests for invalid input layout qualifiers. > +// > +// GLSLangSpec 1.50, section 4.3.8.1 (Input Layout Qualifiers): > +// "Only one argument is accepted. For example, > +// layout(triangles) in;" > +// > + > +#version 150 > + > +layout(points, std140) in; > + > +void main() > +{ > +} > -- > 1.8.5.3 > > _______________________________________________ > Piglit mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/piglit
line_strip and triangle_strip are also invalid input layout qualifiers. You can add tests for them as well. _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
