[Piglit] [PATCH 09/13] glsl-es-1.00: Convert minimum-maximums tests to use built-in-constants program
Ian Romanick
idr at freedesktop.org
Mon Aug 26 10:33:11 PDT 2013
From: Ian Romanick <ian.d.romanick at intel.com>
minimum-maximums.txt was generated by:
cd tests/spec/glsl-es-1.00
echo 1.00 > minimum-maximums.txt
grep gl_Max execution/maximums/gl_Max* |\
sort |\
sed 's/[^(]\+[(]//;s/ >= / /;s/[)]$//' >> minimum-maximums.txt
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
tests/all.tests | 1 +
.../gl_MaxCombinedTextureImageUnits.shader_test | 30 ----------------------
.../maximums/gl_MaxDrawBuffers.shader_test | 29 ---------------------
.../gl_MaxFragmentUniformVectors.shader_test | 29 ---------------------
.../maximums/gl_MaxTextureImageUnits.shader_test | 29 ---------------------
.../maximums/gl_MaxVaryingVectors.shader_test | 29 ---------------------
.../maximums/gl_MaxVertexAttribs.shader_test | 29 ---------------------
.../gl_MaxVertexTextureImageUnits.shader_test | 29 ---------------------
.../gl_MaxVertexUniformVectors.shader_test | 29 ---------------------
tests/spec/glsl-es-1.00/minimum-maximums.txt | 9 +++++++
10 files changed, 10 insertions(+), 233 deletions(-)
delete mode 100644 tests/spec/glsl-es-1.00/execution/maximums/gl_MaxCombinedTextureImageUnits.shader_test
delete mode 100644 tests/spec/glsl-es-1.00/execution/maximums/gl_MaxDrawBuffers.shader_test
delete mode 100644 tests/spec/glsl-es-1.00/execution/maximums/gl_MaxFragmentUniformVectors.shader_test
delete mode 100644 tests/spec/glsl-es-1.00/execution/maximums/gl_MaxTextureImageUnits.shader_test
delete mode 100644 tests/spec/glsl-es-1.00/execution/maximums/gl_MaxVaryingVectors.shader_test
delete mode 100644 tests/spec/glsl-es-1.00/execution/maximums/gl_MaxVertexAttribs.shader_test
delete mode 100644 tests/spec/glsl-es-1.00/execution/maximums/gl_MaxVertexTextureImageUnits.shader_test
delete mode 100644 tests/spec/glsl-es-1.00/execution/maximums/gl_MaxVertexUniformVectors.shader_test
create mode 100644 tests/spec/glsl-es-1.00/minimum-maximums.txt
diff --git a/tests/all.tests b/tests/all.tests
index f77c3aa..52423d4 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -767,6 +767,7 @@ spec['glsl-es-1.00']['execution'] = Group()
add_shader_test_dir(spec['glsl-es-1.00']['execution'],
os.path.join(testsDir, 'spec', 'glsl-es-1.00', 'execution'),
recursive=True)
+spec['glsl-es-1.00']['built-in constants'] = concurrent_test('built-in-constants_gles2 tests/spec/glsl-es-1.00/minimum-maximums.txt')
# Group spec/glsl-1.10
spec['glsl-1.10'] = Group()
diff --git a/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxCombinedTextureImageUnits.shader_test b/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxCombinedTextureImageUnits.shader_test
deleted file mode 100644
index 887cb8f..0000000
--- a/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxCombinedTextureImageUnits.shader_test
+++ /dev/null
@@ -1,30 +0,0 @@
-# [description]
-# Tests for GLSL ES 1.00 minimum maximums for the builtin constants.
-#
-# See the GLSL ES 1.0.17 specification, section 7.4, page 61
-
-[require]
-GLSL ES >= 1.00
-GL ES >= 2.0
-
-[vertex shader]
-attribute vec4 vertex;
-
-void main(void)
-{
- gl_Position = vertex;
-}
-
-[fragment shader]
-
-void main(void)
-{
- if (gl_MaxCombinedTextureImageUnits >= 8)
- gl_FragColor = vec4(0, 1, 0, 0);
- else
- gl_FragColor = vec4(1, 0, 0, 0);
-}
-
-[test]
-draw rect -1 -1 2 2
-probe all rgba 0.0 1.0 0.0 0.0
diff --git a/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxDrawBuffers.shader_test b/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxDrawBuffers.shader_test
deleted file mode 100644
index b9a9b5b..0000000
--- a/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxDrawBuffers.shader_test
+++ /dev/null
@@ -1,29 +0,0 @@
-# [description]
-# Tests for GLSL ES 1.00 minimum maximums for the builtin constants.
-#
-# See the GLSL ES 1.0.17 specification, section 7.4, page 61.
-
-[require]
-GLSL ES >= 1.00
-GL ES >= 2.0
-
-[vertex shader]
-attribute vec4 vertex;
-
-void main(void)
-{
- gl_Position = vertex;
-}
-
-[fragment shader]
-void main(void)
-{
- if (gl_MaxDrawBuffers >= 1)
- gl_FragColor = vec4(0, 1, 0, 0);
- else
- gl_FragColor = vec4(1, 0, 0, 0);
-}
-
-[test]
-draw rect -1 -1 2 2
-probe all rgba 0.0 1.0 0.0 0.0
diff --git a/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxFragmentUniformVectors.shader_test b/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxFragmentUniformVectors.shader_test
deleted file mode 100644
index df3ecbc..0000000
--- a/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxFragmentUniformVectors.shader_test
+++ /dev/null
@@ -1,29 +0,0 @@
-# [description]
-# Tests for GLSL ES 1.00 minimum maximums for the builtin constants.
-#
-# See the GLSL ES 1.0.17 specification, section 7.4, page 61.
-
-[require]
-GLSL ES >= 1.00
-GL ES >= 2.0
-
-[vertex shader]
-attribute vec4 vertex;
-
-void main(void)
-{
- gl_Position = vertex;
-}
-
-[fragment shader]
-void main(void)
-{
- if (gl_MaxFragmentUniformVectors >= 16)
- gl_FragColor = vec4(0, 1, 0, 0);
- else
- gl_FragColor = vec4(1, 0, 0, 0);
-}
-
-[test]
-draw rect -1 -1 2 2
-probe all rgba 0.0 1.0 0.0 0.0
diff --git a/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxTextureImageUnits.shader_test b/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxTextureImageUnits.shader_test
deleted file mode 100644
index e1b0ed7..0000000
--- a/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxTextureImageUnits.shader_test
+++ /dev/null
@@ -1,29 +0,0 @@
-# [description]
-# Tests for GLSL ES 1.00 minimum maximums for the builtin constants.
-#
-# See the GLSL ES 1.0.17 specification, section 7.4, page 61.
-
-[require]
-GLSL ES >= 1.00
-GL ES >= 2.0
-
-[vertex shader]
-attribute vec4 vertex;
-
-void main(void)
-{
- gl_Position = vertex;
-}
-
-[fragment shader]
-void main(void)
-{
- if (gl_MaxTextureImageUnits >= 8)
- gl_FragColor = vec4(0, 1, 0, 0);
- else
- gl_FragColor = vec4(1, 0, 0, 0);
-}
-
-[test]
-draw rect -1 -1 2 2
-probe all rgba 0.0 1.0 0.0 0.0
diff --git a/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxVaryingVectors.shader_test b/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxVaryingVectors.shader_test
deleted file mode 100644
index 871b07c..0000000
--- a/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxVaryingVectors.shader_test
+++ /dev/null
@@ -1,29 +0,0 @@
-# [description]
-# Tests for GLSL ES 1.00 minimum maximums for the builtin constants.
-#
-# See the GLSL ES 1.0.17 specification, section 7.4, page 61.
-
-[require]
-GLSL ES >= 1.00
-GL ES >= 2.0
-
-[vertex shader]
-attribute vec4 vertex;
-
-void main(void)
-{
- gl_Position = vertex;
-}
-
-[fragment shader]
-void main(void)
-{
- if (gl_MaxVaryingVectors >= 8)
- gl_FragColor = vec4(0, 1, 0, 0);
- else
- gl_FragColor = vec4(1, 0, 0, 0);
-}
-
-[test]
-draw rect -1 -1 2 2
-probe all rgba 0.0 1.0 0.0 0.0
diff --git a/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxVertexAttribs.shader_test b/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxVertexAttribs.shader_test
deleted file mode 100644
index 82ea187..0000000
--- a/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxVertexAttribs.shader_test
+++ /dev/null
@@ -1,29 +0,0 @@
-# [description]
-# Tests for GLSL ES 1.00 minimum maximums for the builtin constants.
-#
-# See the GLSL ES 1.0.17 specification, section 7.4, page 61.
-
-[require]
-GLSL ES >= 1.00
-GL ES >= 2.0
-
-[vertex shader]
-attribute vec4 vertex;
-
-void main(void)
-{
- gl_Position = vertex;
-}
-
-[fragment shader]
-void main(void)
-{
- if (gl_MaxVertexAttribs >= 8)
- gl_FragColor = vec4(0, 1, 0, 0);
- else
- gl_FragColor = vec4(1, 0, 0, 0);
-}
-
-[test]
-draw rect -1 -1 2 2
-probe all rgba 0.0 1.0 0.0 0.0
diff --git a/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxVertexTextureImageUnits.shader_test b/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxVertexTextureImageUnits.shader_test
deleted file mode 100644
index 1a27665..0000000
--- a/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxVertexTextureImageUnits.shader_test
+++ /dev/null
@@ -1,29 +0,0 @@
-# [description]
-# Tests for GLSL ES 1.00 minimum maximums for the builtin constants.
-#
-# See the GLSL ES 1.0.17 specification, section 7.4, page 61.
-
-[require]
-GLSL ES >= 1.00
-GL ES >= 2.0
-
-[vertex shader]
-attribute vec4 vertex;
-
-void main(void)
-{
- gl_Position = vertex;
-}
-
-[fragment shader]
-void main(void)
-{
- if (gl_MaxVertexTextureImageUnits >= 0)
- gl_FragColor = vec4(0, 1, 0, 0);
- else
- gl_FragColor = vec4(1, 0, 0, 0);
-}
-
-[test]
-draw rect -1 -1 2 2
-probe all rgba 0.0 1.0 0.0 0.0
diff --git a/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxVertexUniformVectors.shader_test b/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxVertexUniformVectors.shader_test
deleted file mode 100644
index 9f85b79..0000000
--- a/tests/spec/glsl-es-1.00/execution/maximums/gl_MaxVertexUniformVectors.shader_test
+++ /dev/null
@@ -1,29 +0,0 @@
-# [description]
-# Tests for GLSL ES 1.00 minimum maximums for the builtin constants.
-#
-# See the GLSL ES 1.0.17 specification, section 7.4, page 61.
-
-[require]
-GLSL ES >= 1.00
-GL ES >= 2.0
-
-[vertex shader]
-attribute vec4 vertex;
-
-void main(void)
-{
- gl_Position = vertex;
-}
-
-[fragment shader]
-void main(void)
-{
- if (gl_MaxVertexUniformVectors >= 128)
- gl_FragColor = vec4(0, 1, 0, 0);
- else
- gl_FragColor = vec4(1, 0, 0, 0);
-}
-
-[test]
-draw rect -1 -1 2 2
-probe all rgba 0.0 1.0 0.0 0.0
diff --git a/tests/spec/glsl-es-1.00/minimum-maximums.txt b/tests/spec/glsl-es-1.00/minimum-maximums.txt
new file mode 100644
index 0000000..939db0d
--- /dev/null
+++ b/tests/spec/glsl-es-1.00/minimum-maximums.txt
@@ -0,0 +1,9 @@
+1.00
+gl_MaxCombinedTextureImageUnits 8
+gl_MaxDrawBuffers 1
+gl_MaxFragmentUniformVectors 16
+gl_MaxTextureImageUnits 8
+gl_MaxVaryingVectors 8
+gl_MaxVertexAttribs 8
+gl_MaxVertexTextureImageUnits 0
+gl_MaxVertexUniformVectors 128
--
1.8.1.4
More information about the Piglit
mailing list