[Piglit] [PATCH] Fix invalid gs qualifier "layout(triangles) out" in a few tests.

Jordan Justen jljusten at gmail.com
Tue Oct 22 19:44:37 CEST 2013


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

On Tue, Oct 22, 2013 at 10:37 AM, Paul Berry <stereotype441 at gmail.com> wrote:
> "triangles" is not a valid geometry shader output primitive type.
> "triangle_strip" must be used instead.
> ---
>  .../spec/glsl-1.50/execution/invariant-qualifier-everywhere.shader_test | 2 +-
>  .../invariant-qualifier-everywhere-gs-fs-inconsistency.shader_test      | 2 +-
>  .../invariant-qualifier-everywhere-vs-gs-inconsistency.shader_test      | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tests/spec/glsl-1.50/execution/invariant-qualifier-everywhere.shader_test b/tests/spec/glsl-1.50/execution/invariant-qualifier-everywhere.shader_test
> index 4a82a99..7678bee 100644
> --- a/tests/spec/glsl-1.50/execution/invariant-qualifier-everywhere.shader_test
> +++ b/tests/spec/glsl-1.50/execution/invariant-qualifier-everywhere.shader_test
> @@ -42,7 +42,7 @@ void main()
>  #version 150
>
>  layout(triangles) in;
> -layout(triangles, max_vertices=3) out;
> +layout(triangle_strip, max_vertices=3) out;
>
>  invariant in vec4 pos[];
>  invariant in vec4 extra01[];
> diff --git a/tests/spec/glsl-1.50/linker/invariant-qualifier-everywhere-gs-fs-inconsistency.shader_test b/tests/spec/glsl-1.50/linker/invariant-qualifier-everywhere-gs-fs-inconsistency.shader_test
> index 6454283..d208285 100644
> --- a/tests/spec/glsl-1.50/linker/invariant-qualifier-everywhere-gs-fs-inconsistency.shader_test
> +++ b/tests/spec/glsl-1.50/linker/invariant-qualifier-everywhere-gs-fs-inconsistency.shader_test
> @@ -42,7 +42,7 @@ void main()
>  #version 150
>
>  layout(triangles) in;
> -layout(triangles, max_vertices=3) out;
> +layout(triangle_strip, max_vertices=3) out;
>
>  invariant in vec4 pos[];
>  invariant in vec4 extra01[];
> diff --git a/tests/spec/glsl-1.50/linker/invariant-qualifier-everywhere-vs-gs-inconsistency.shader_test b/tests/spec/glsl-1.50/linker/invariant-qualifier-everywhere-vs-gs-inconsistency.shader_test
> index 56af4f8..d976289 100644
> --- a/tests/spec/glsl-1.50/linker/invariant-qualifier-everywhere-vs-gs-inconsistency.shader_test
> +++ b/tests/spec/glsl-1.50/linker/invariant-qualifier-everywhere-vs-gs-inconsistency.shader_test
> @@ -42,7 +42,7 @@ void main()
>  #version 150
>
>  layout(triangles) in;
> -layout(triangles, max_vertices=3) out;
> +layout(triangle_strip, max_vertices=3) out;
>
>  //invariant
>  in vec4 pos[];
> --
> 1.8.4.1
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit


More information about the Piglit mailing list