[Piglit] [PATCH 07/13] glsl-1.50: Convert minimum-maximums tests to use built-in-constants program

[Ian Romanick]

From: Ian Romanick <ian.d.romanick at intel.com>

minimum-maximums.txt was created by copy-and-pasting directly from
section 7.4 followed by 's/ = / /;s/;//'.  This is why the names are not
listed in alphabetic order.

The old tests did not verify all of the constants.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: Nicholas Mack <nichmack at gmail.com>
---
 .../gl_MaxCombinedTextureImageUnits.shader_test    | 40 ----------------------
 .../maximums/gl_MaxVaryingFloats.shader_test       | 39 ---------------------
 tests/spec/glsl-1.50/minimum-maximums.txt          | 20 +++++++++++
 3 files changed, 20 insertions(+), 79 deletions(-)
 delete mode 100644 tests/spec/glsl-1.50/execution/maximums/gl_MaxCombinedTextureImageUnits.shader_test
 delete mode 100644 tests/spec/glsl-1.50/execution/maximums/gl_MaxVaryingFloats.shader_test
 create mode 100644 tests/spec/glsl-1.50/minimum-maximums.txt

diff --git a/tests/spec/glsl-1.50/execution/maximums/gl_MaxCombinedTextureImageUnits.shader_test b/tests/spec/glsl-1.50/execution/maximums/gl_MaxCombinedTextureImageUnits.shader_test
deleted file mode 100644
index 11326c6..0000000
--- a/tests/spec/glsl-1.50/execution/maximums/gl_MaxCombinedTextureImageUnits.shader_test
+++ /dev/null
@@ -1,40 +0,0 @@
-# [description]
-# Tests for GLSL 1.50 minimum maximums for the builtin constant
-# gl_MaxCombinedTextureImageUnits.
-#
-# The new minimum maximum for gl_MaxCombinedTextureImageUnits is 48;
-# See the GLSL 1.50.09 specification, section 7.4, page 74.
-
-[require]
-GLSL >= 1.50
-
-[vertex shader]
-#version 150
-
-in vec4 vertex;
-
-void main(void)
-{
-	gl_Position = vertex;
-}
-
-[fragment shader]
-#version 150
-void main(void)
-{
-	if (gl_MaxCombinedTextureImageUnits >= 48)
-		gl_FragColor = vec4(0, 1, 0, 0);
-	else
-		gl_FragColor = vec4(1, 0, 0, 0);
-}
-
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0  1.0
--1.0  1.0
-
-[test]
-draw arrays GL_TRIANGLE_FAN 0 4
-probe all rgba 0.0 1.0 0.0 0.0
diff --git a/tests/spec/glsl-1.50/execution/maximums/gl_MaxVaryingFloats.shader_test b/tests/spec/glsl-1.50/execution/maximums/gl_MaxVaryingFloats.shader_test
deleted file mode 100644
index 4d36193..0000000
--- a/tests/spec/glsl-1.50/execution/maximums/gl_MaxVaryingFloats.shader_test
+++ /dev/null
@@ -1,39 +0,0 @@
-# [description]
-# Tests for GLSL 1.50 minimum maximums for the builtin constants.
-#
-# The new minimum maximum for gl_MaxVaryingFloats is 60;
-# See the GLSL 1.50.09 specification, section 7.4, page 74.
-
-[require]
-GLSL >= 1.50
-
-[vertex shader]
-#version 150
-
-in vec4 vertex;
-
-void main(void)
-{
-	gl_Position = vertex;
-}
-
-[fragment shader]
-#version 150
-void main(void)
-{
-	if (gl_MaxVaryingFloats >= 60)
-		gl_FragColor = vec4(0, 1, 0, 0);
-	else
-		gl_FragColor = vec4(1, 0, 0, 0);
-}
-
-[vertex data]
-vertex/float/2
--1.0 -1.0
- 1.0 -1.0
- 1.0  1.0
--1.0  1.0
-
-[test]
-draw arrays GL_TRIANGLE_FAN 0 4
-probe all rgba 0.0 1.0 0.0 0.0
diff --git a/tests/spec/glsl-1.50/minimum-maximums.txt b/tests/spec/glsl-1.50/minimum-maximums.txt
new file mode 100644
index 0000000..a8bb936
--- /dev/null
+++ b/tests/spec/glsl-1.50/minimum-maximums.txt
@@ -0,0 +1,20 @@
+1.50
+gl_MaxVertexAttribs 16
+gl_MaxVertexUniformComponents 1024
+gl_MaxVaryingFloats 60
+gl_MaxVaryingComponents 60
+gl_MaxVertexOutputComponents 64
+gl_MaxGeometryInputComponents 64
+gl_MaxGeometryOutputComponents 128
+gl_MaxFragmentInputComponents 128
+gl_MaxVertexTextureImageUnits 16
+gl_MaxCombinedTextureImageUnits 48
+gl_MaxTextureImageUnits 16
+gl_MaxFragmentUniformComponents 1024
+gl_MaxDrawBuffers 8
+gl_MaxClipDistances 8
+gl_MaxGeometryTextureImageUnits 16
+gl_MaxGeometryOutputVertices 256
+gl_MaxGeometryTotalOutputComponents 1024
+gl_MaxGeometryUniformComponents 1024
+gl_MaxGeometryVaryingComponents 64
-- 
1.8.1.4