[Piglit] [PATCH 04/10] sso: Add tests for the preprocessor define

[Jordan Justen]

Did you get this yet for sso tests?
+import_glsl_parser_tests(arb_separate_shader_objects,
+                        testsDir + '/spec/arb_separate_shader_objects', [''])

Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>

-Jordan

On Sun, Apr 27, 2014 at 2:12 PM, Ian Romanick <idr at freedesktop.org> wrote:
> From: Ian Romanick <ian.d.romanick at intel.com>
>
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> ---
>  .../compiler/1.10/define.frag                          | 18 ++++++++++++++++++
>  .../compiler/1.10/define.vert                          | 18 ++++++++++++++++++
>  .../compiler/1.20/define.frag                          | 18 ++++++++++++++++++
>  .../compiler/1.20/define.vert                          | 18 ++++++++++++++++++
>  .../compiler/1.30/define.frag                          | 18 ++++++++++++++++++
>  .../compiler/1.30/define.vert                          | 18 ++++++++++++++++++
>  .../compiler/1.40/define.frag                          | 18 ++++++++++++++++++
>  .../compiler/1.40/define.vert                          | 18 ++++++++++++++++++
>  .../compiler/1.50/define.frag                          | 18 ++++++++++++++++++
>  .../compiler/1.50/define.geom                          | 18 ++++++++++++++++++
>  .../compiler/1.50/define.vert                          | 18 ++++++++++++++++++
>  11 files changed, 198 insertions(+)
>  create mode 100644 tests/spec/arb_separate_shader_objects/compiler/1.10/define.frag
>  create mode 100644 tests/spec/arb_separate_shader_objects/compiler/1.10/define.vert
>  create mode 100644 tests/spec/arb_separate_shader_objects/compiler/1.20/define.frag
>  create mode 100644 tests/spec/arb_separate_shader_objects/compiler/1.20/define.vert
>  create mode 100644 tests/spec/arb_separate_shader_objects/compiler/1.30/define.frag
>  create mode 100644 tests/spec/arb_separate_shader_objects/compiler/1.30/define.vert
>  create mode 100644 tests/spec/arb_separate_shader_objects/compiler/1.40/define.frag
>  create mode 100644 tests/spec/arb_separate_shader_objects/compiler/1.40/define.vert
>  create mode 100644 tests/spec/arb_separate_shader_objects/compiler/1.50/define.frag
>  create mode 100644 tests/spec/arb_separate_shader_objects/compiler/1.50/define.geom
>  create mode 100644 tests/spec/arb_separate_shader_objects/compiler/1.50/define.vert
>
> diff --git a/tests/spec/arb_separate_shader_objects/compiler/1.10/define.frag b/tests/spec/arb_separate_shader_objects/compiler/1.10/define.frag
> new file mode 100644
> index 0000000..8ea068b
> --- /dev/null
> +++ b/tests/spec/arb_separate_shader_objects/compiler/1.10/define.frag
> @@ -0,0 +1,18 @@
> +// [config]
> +// expect_result: pass
> +// glsl_version: 1.10
> +// require_extensions: GL_ARB_separate_shader_objects
> +// [end config]
> +#version 110
> +#extension GL_ARB_separate_shader_objects: require
> +
> +#if !defined GL_ARB_separate_shader_objects
> +#  error GL_ARB_separate_shader_objects is not defined
> +#elif GL_ARB_separate_shader_objects != 1
> +#  error GL_ARB_separate_shader_objects is not equal to 1
> +#endif
> +
> +/* Some compilers generate spurious errors if a shader does not contain
> + * any code or declarations.
> + */
> +int foo(void) { return 1; }
> diff --git a/tests/spec/arb_separate_shader_objects/compiler/1.10/define.vert b/tests/spec/arb_separate_shader_objects/compiler/1.10/define.vert
> new file mode 100644
> index 0000000..8ea068b
> --- /dev/null
> +++ b/tests/spec/arb_separate_shader_objects/compiler/1.10/define.vert
> @@ -0,0 +1,18 @@
> +// [config]
> +// expect_result: pass
> +// glsl_version: 1.10
> +// require_extensions: GL_ARB_separate_shader_objects
> +// [end config]
> +#version 110
> +#extension GL_ARB_separate_shader_objects: require
> +
> +#if !defined GL_ARB_separate_shader_objects
> +#  error GL_ARB_separate_shader_objects is not defined
> +#elif GL_ARB_separate_shader_objects != 1
> +#  error GL_ARB_separate_shader_objects is not equal to 1
> +#endif
> +
> +/* Some compilers generate spurious errors if a shader does not contain
> + * any code or declarations.
> + */
> +int foo(void) { return 1; }
> diff --git a/tests/spec/arb_separate_shader_objects/compiler/1.20/define.frag b/tests/spec/arb_separate_shader_objects/compiler/1.20/define.frag
> new file mode 100644
> index 0000000..fac81b9
> --- /dev/null
> +++ b/tests/spec/arb_separate_shader_objects/compiler/1.20/define.frag
> @@ -0,0 +1,18 @@
> +// [config]
> +// expect_result: pass
> +// glsl_version: 1.20
> +// require_extensions: GL_ARB_separate_shader_objects
> +// [end config]
> +#version 120
> +#extension GL_ARB_separate_shader_objects: require
> +
> +#if !defined GL_ARB_separate_shader_objects
> +#  error GL_ARB_separate_shader_objects is not defined
> +#elif GL_ARB_separate_shader_objects != 1
> +#  error GL_ARB_separate_shader_objects is not equal to 1
> +#endif
> +
> +/* Some compilers generate spurious errors if a shader does not contain
> + * any code or declarations.
> + */
> +int foo(void) { return 1; }
> diff --git a/tests/spec/arb_separate_shader_objects/compiler/1.20/define.vert b/tests/spec/arb_separate_shader_objects/compiler/1.20/define.vert
> new file mode 100644
> index 0000000..fac81b9
> --- /dev/null
> +++ b/tests/spec/arb_separate_shader_objects/compiler/1.20/define.vert
> @@ -0,0 +1,18 @@
> +// [config]
> +// expect_result: pass
> +// glsl_version: 1.20
> +// require_extensions: GL_ARB_separate_shader_objects
> +// [end config]
> +#version 120
> +#extension GL_ARB_separate_shader_objects: require
> +
> +#if !defined GL_ARB_separate_shader_objects
> +#  error GL_ARB_separate_shader_objects is not defined
> +#elif GL_ARB_separate_shader_objects != 1
> +#  error GL_ARB_separate_shader_objects is not equal to 1
> +#endif
> +
> +/* Some compilers generate spurious errors if a shader does not contain
> + * any code or declarations.
> + */
> +int foo(void) { return 1; }
> diff --git a/tests/spec/arb_separate_shader_objects/compiler/1.30/define.frag b/tests/spec/arb_separate_shader_objects/compiler/1.30/define.frag
> new file mode 100644
> index 0000000..ddccb6e
> --- /dev/null
> +++ b/tests/spec/arb_separate_shader_objects/compiler/1.30/define.frag
> @@ -0,0 +1,18 @@
> +// [config]
> +// expect_result: pass
> +// glsl_version: 1.30
> +// require_extensions: GL_ARB_separate_shader_objects
> +// [end config]
> +#version 130
> +#extension GL_ARB_separate_shader_objects: require
> +
> +#if !defined GL_ARB_separate_shader_objects
> +#  error GL_ARB_separate_shader_objects is not defined
> +#elif GL_ARB_separate_shader_objects != 1
> +#  error GL_ARB_separate_shader_objects is not equal to 1
> +#endif
> +
> +/* Some compilers generate spurious errors if a shader does not contain
> + * any code or declarations.
> + */
> +int foo(void) { return 1; }
> diff --git a/tests/spec/arb_separate_shader_objects/compiler/1.30/define.vert b/tests/spec/arb_separate_shader_objects/compiler/1.30/define.vert
> new file mode 100644
> index 0000000..ddccb6e
> --- /dev/null
> +++ b/tests/spec/arb_separate_shader_objects/compiler/1.30/define.vert
> @@ -0,0 +1,18 @@
> +// [config]
> +// expect_result: pass
> +// glsl_version: 1.30
> +// require_extensions: GL_ARB_separate_shader_objects
> +// [end config]
> +#version 130
> +#extension GL_ARB_separate_shader_objects: require
> +
> +#if !defined GL_ARB_separate_shader_objects
> +#  error GL_ARB_separate_shader_objects is not defined
> +#elif GL_ARB_separate_shader_objects != 1
> +#  error GL_ARB_separate_shader_objects is not equal to 1
> +#endif
> +
> +/* Some compilers generate spurious errors if a shader does not contain
> + * any code or declarations.
> + */
> +int foo(void) { return 1; }
> diff --git a/tests/spec/arb_separate_shader_objects/compiler/1.40/define.frag b/tests/spec/arb_separate_shader_objects/compiler/1.40/define.frag
> new file mode 100644
> index 0000000..9ae5932
> --- /dev/null
> +++ b/tests/spec/arb_separate_shader_objects/compiler/1.40/define.frag
> @@ -0,0 +1,18 @@
> +// [config]
> +// expect_result: pass
> +// glsl_version: 1.40
> +// require_extensions: GL_ARB_separate_shader_objects
> +// [end config]
> +#version 140
> +#extension GL_ARB_separate_shader_objects: require
> +
> +#if !defined GL_ARB_separate_shader_objects
> +#  error GL_ARB_separate_shader_objects is not defined
> +#elif GL_ARB_separate_shader_objects != 1
> +#  error GL_ARB_separate_shader_objects is not equal to 1
> +#endif
> +
> +/* Some compilers generate spurious errors if a shader does not contain
> + * any code or declarations.
> + */
> +int foo(void) { return 1; }
> diff --git a/tests/spec/arb_separate_shader_objects/compiler/1.40/define.vert b/tests/spec/arb_separate_shader_objects/compiler/1.40/define.vert
> new file mode 100644
> index 0000000..9ae5932
> --- /dev/null
> +++ b/tests/spec/arb_separate_shader_objects/compiler/1.40/define.vert
> @@ -0,0 +1,18 @@
> +// [config]
> +// expect_result: pass
> +// glsl_version: 1.40
> +// require_extensions: GL_ARB_separate_shader_objects
> +// [end config]
> +#version 140
> +#extension GL_ARB_separate_shader_objects: require
> +
> +#if !defined GL_ARB_separate_shader_objects
> +#  error GL_ARB_separate_shader_objects is not defined
> +#elif GL_ARB_separate_shader_objects != 1
> +#  error GL_ARB_separate_shader_objects is not equal to 1
> +#endif
> +
> +/* Some compilers generate spurious errors if a shader does not contain
> + * any code or declarations.
> + */
> +int foo(void) { return 1; }
> diff --git a/tests/spec/arb_separate_shader_objects/compiler/1.50/define.frag b/tests/spec/arb_separate_shader_objects/compiler/1.50/define.frag
> new file mode 100644
> index 0000000..ae1f2e9
> --- /dev/null
> +++ b/tests/spec/arb_separate_shader_objects/compiler/1.50/define.frag
> @@ -0,0 +1,18 @@
> +// [config]
> +// expect_result: pass
> +// glsl_version: 1.50
> +// require_extensions: GL_ARB_separate_shader_objects
> +// [end config]
> +#version 150
> +#extension GL_ARB_separate_shader_objects: require
> +
> +#if !defined GL_ARB_separate_shader_objects
> +#  error GL_ARB_separate_shader_objects is not defined
> +#elif GL_ARB_separate_shader_objects != 1
> +#  error GL_ARB_separate_shader_objects is not equal to 1
> +#endif
> +
> +/* Some compilers generate spurious errors if a shader does not contain
> + * any code or declarations.
> + */
> +int foo(void) { return 1; }
> diff --git a/tests/spec/arb_separate_shader_objects/compiler/1.50/define.geom b/tests/spec/arb_separate_shader_objects/compiler/1.50/define.geom
> new file mode 100644
> index 0000000..ae1f2e9
> --- /dev/null
> +++ b/tests/spec/arb_separate_shader_objects/compiler/1.50/define.geom
> @@ -0,0 +1,18 @@
> +// [config]
> +// expect_result: pass
> +// glsl_version: 1.50
> +// require_extensions: GL_ARB_separate_shader_objects
> +// [end config]
> +#version 150
> +#extension GL_ARB_separate_shader_objects: require
> +
> +#if !defined GL_ARB_separate_shader_objects
> +#  error GL_ARB_separate_shader_objects is not defined
> +#elif GL_ARB_separate_shader_objects != 1
> +#  error GL_ARB_separate_shader_objects is not equal to 1
> +#endif
> +
> +/* Some compilers generate spurious errors if a shader does not contain
> + * any code or declarations.
> + */
> +int foo(void) { return 1; }
> diff --git a/tests/spec/arb_separate_shader_objects/compiler/1.50/define.vert b/tests/spec/arb_separate_shader_objects/compiler/1.50/define.vert
> new file mode 100644
> index 0000000..ae1f2e9
> --- /dev/null
> +++ b/tests/spec/arb_separate_shader_objects/compiler/1.50/define.vert
> @@ -0,0 +1,18 @@
> +// [config]
> +// expect_result: pass
> +// glsl_version: 1.50
> +// require_extensions: GL_ARB_separate_shader_objects
> +// [end config]
> +#version 150
> +#extension GL_ARB_separate_shader_objects: require
> +
> +#if !defined GL_ARB_separate_shader_objects
> +#  error GL_ARB_separate_shader_objects is not defined
> +#elif GL_ARB_separate_shader_objects != 1
> +#  error GL_ARB_separate_shader_objects is not equal to 1
> +#endif
> +
> +/* Some compilers generate spurious errors if a shader does not contain
> + * any code or declarations.
> + */
> +int foo(void) { return 1; }
> --
> 1.8.1.4
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit