[Piglit] [PATCH 1/3] shader_runner: remove explicit #version from spec/glsl-1.10 tests

[Stuart Abercrombie]

Can I get a review/commit please?


On Mon, Apr 1, 2013 at 9:52 AM, Stuart Abercrombie <
sabercrombie at chromium.org> wrote:

> It will be added based on the GLSL requirement instead.
>
> Same number of passes on Sandy Bridge running all.tests without glean.
>
> Signed-off-by: Stuart Abercrombie <sabercrombie at chromium.org>
> ---
>  .../maximums/gl_MaxClipPlanes.shader_test          |    2 --
>  .../gl_MaxCombinedTextureImageUnits.shader_test    |    2 --
>  .../maximums/gl_MaxDrawBuffers.shader_test         |    2 --
>  .../gl_MaxFragmentUniformComponents.shader_test    |    2 --
>  .../execution/maximums/gl_MaxLights.shader_test    |    2 --
>  .../maximums/gl_MaxTextureCoords.shader_test       |    2 --
>  .../maximums/gl_MaxTextureImageUnits.shader_test   |    2 --
>  .../maximums/gl_MaxTextureUnits.shader_test        |    2 --
>  .../maximums/gl_MaxVaryingFloats.shader_test       |    2 --
>  .../maximums/gl_MaxVertexAttribs.shader_test       |    2 --
>  .../gl_MaxVertexTextureImageUnits.shader_test      |    2 --
>  .../gl_MaxVertexUniformComponents.shader_test      |    2 --
>  12 files changed, 24 deletions(-)
>
> diff --git
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxClipPlanes.shader_test
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxClipPlanes.shader_test
> index 6314151..0df6d5b 100644
> --- a/tests/spec/glsl-1.10/execution/maximums/gl_MaxClipPlanes.shader_test
> +++ b/tests/spec/glsl-1.10/execution/maximums/gl_MaxClipPlanes.shader_test
> @@ -7,14 +7,12 @@
>  GLSL >= 1.10
>
>  [vertex shader]
> -#version 110
>  void main(void)
>  {
>         gl_Position = gl_Vertex;
>  }
>
>  [fragment shader]
> -#version 110
>  void main(void)
>  {
>         if (gl_MaxClipPlanes >= 6)
> diff --git
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxCombinedTextureImageUnits.shader_test
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxCombinedTextureImageUnits.shader_test
> index f480e5c..d730203 100644
> ---
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxCombinedTextureImageUnits.shader_test
> +++
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxCombinedTextureImageUnits.shader_test
> @@ -7,14 +7,12 @@
>  GLSL >= 1.10
>
>  [vertex shader]
> -#version 110
>  void main(void)
>  {
>         gl_Position = gl_Vertex;
>  }
>
>  [fragment shader]
> -#version 110
>  void main(void)
>  {
>         if (gl_MaxCombinedTextureImageUnits >= 2)
> diff --git
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxDrawBuffers.shader_test
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxDrawBuffers.shader_test
> index 61ca295..580ffe2 100644
> --- a/tests/spec/glsl-1.10/execution/maximums/gl_MaxDrawBuffers.shader_test
> +++ b/tests/spec/glsl-1.10/execution/maximums/gl_MaxDrawBuffers.shader_test
> @@ -7,14 +7,12 @@
>  GLSL >= 1.10
>
>  [vertex shader]
> -#version 110
>  void main(void)
>  {
>         gl_Position = gl_Vertex;
>  }
>
>  [fragment shader]
> -#version 110
>  void main(void)
>  {
>         if (gl_MaxDrawBuffers >= 1)
> diff --git
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxFragmentUniformComponents.shader_test
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxFragmentUniformComponents.shader_test
> index 537fcbb..c1d91bd 100644
> ---
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxFragmentUniformComponents.shader_test
> +++
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxFragmentUniformComponents.shader_test
> @@ -7,14 +7,12 @@
>  GLSL >= 1.10
>
>  [vertex shader]
> -#version 110
>  void main(void)
>  {
>         gl_Position = gl_Vertex;
>  }
>
>  [fragment shader]
> -#version 110
>  void main(void)
>  {
>         if (gl_MaxFragmentUniformComponents >= 64)
> diff --git
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxLights.shader_test
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxLights.shader_test
> index c7cbf9d..a6fd610 100644
> --- a/tests/spec/glsl-1.10/execution/maximums/gl_MaxLights.shader_test
> +++ b/tests/spec/glsl-1.10/execution/maximums/gl_MaxLights.shader_test
> @@ -7,14 +7,12 @@
>  GLSL >= 1.10
>
>  [vertex shader]
> -#version 110
>  void main(void)
>  {
>         gl_Position = gl_Vertex;
>  }
>
>  [fragment shader]
> -#version 110
>  void main(void)
>  {
>         if (gl_MaxLights >= 8)
> diff --git
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxTextureCoords.shader_test
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxTextureCoords.shader_test
> index 794be9f..74bc08b 100644
> ---
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxTextureCoords.shader_test
> +++
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxTextureCoords.shader_test
> @@ -7,14 +7,12 @@
>  GLSL >= 1.10
>
>  [vertex shader]
> -#version 110
>  void main(void)
>  {
>         gl_Position = gl_Vertex;
>  }
>
>  [fragment shader]
> -#version 110
>  void main(void)
>  {
>         if (gl_MaxTextureCoords >= 2)
> diff --git
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxTextureImageUnits.shader_test
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxTextureImageUnits.shader_test
> index 66b5c74..a2dd5d0 100644
> ---
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxTextureImageUnits.shader_test
> +++
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxTextureImageUnits.shader_test
> @@ -7,14 +7,12 @@
>  GLSL >= 1.10
>
>  [vertex shader]
> -#version 110
>  void main(void)
>  {
>         gl_Position = gl_Vertex;
>  }
>
>  [fragment shader]
> -#version 110
>  void main(void)
>  {
>         if (gl_MaxTextureImageUnits >= 2)
> diff --git
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxTextureUnits.shader_test
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxTextureUnits.shader_test
> index 24db06e..91319a6 100644
> ---
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxTextureUnits.shader_test
> +++
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxTextureUnits.shader_test
> @@ -7,14 +7,12 @@
>  GLSL >= 1.10
>
>  [vertex shader]
> -#version 110
>  void main(void)
>  {
>         gl_Position = gl_Vertex;
>  }
>
>  [fragment shader]
> -#version 110
>  void main(void)
>  {
>         if (gl_MaxTextureUnits >= 2)
> diff --git
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxVaryingFloats.shader_test
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxVaryingFloats.shader_test
> index b55f809..c625aff 100644
> ---
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxVaryingFloats.shader_test
> +++
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxVaryingFloats.shader_test
> @@ -7,14 +7,12 @@
>  GLSL >= 1.10
>
>  [vertex shader]
> -#version 110
>  void main(void)
>  {
>         gl_Position = gl_Vertex;
>  }
>
>  [fragment shader]
> -#version 110
>  void main(void)
>  {
>         if (gl_MaxVaryingFloats >= 32)
> diff --git
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxVertexAttribs.shader_test
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxVertexAttribs.shader_test
> index e0872f9..ddbb25f 100644
> ---
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxVertexAttribs.shader_test
> +++
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxVertexAttribs.shader_test
> @@ -7,14 +7,12 @@
>  GLSL >= 1.10
>
>  [vertex shader]
> -#version 110
>  void main(void)
>  {
>         gl_Position = gl_Vertex;
>  }
>
>  [fragment shader]
> -#version 110
>  void main(void)
>  {
>         if (gl_MaxVertexAttribs >= 16)
> diff --git
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxVertexTextureImageUnits.shader_test
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxVertexTextureImageUnits.shader_test
> index 0dc85e5..066f638 100644
> ---
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxVertexTextureImageUnits.shader_test
> +++
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxVertexTextureImageUnits.shader_test
> @@ -7,14 +7,12 @@
>  GLSL >= 1.10
>
>  [vertex shader]
> -#version 110
>  void main(void)
>  {
>         gl_Position = gl_Vertex;
>  }
>
>  [fragment shader]
> -#version 110
>  void main(void)
>  {
>         if (gl_MaxVertexTextureImageUnits >= 0)
> diff --git
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxVertexUniformComponents.shader_test
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxVertexUniformComponents.shader_test
> index 5386bad..6968a9f 100644
> ---
> a/tests/spec/glsl-1.10/execution/maximums/gl_MaxVertexUniformComponents.shader_test
> +++
> b/tests/spec/glsl-1.10/execution/maximums/gl_MaxVertexUniformComponents.shader_test
> @@ -7,14 +7,12 @@
>  GLSL >= 1.10
>
>  [vertex shader]
> -#version 110
>  void main(void)
>  {
>         gl_Position = gl_Vertex;
>  }
>
>  [fragment shader]
> -#version 110
>  void main(void)
>  {
>         if (gl_MaxVertexUniformComponents >= 512)
> --
> 1.7.9.5
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20130409/e2624178/attachment-0001.html>