[Piglit] [PATCH 11/11] arb_compute_shader: Test remaining compute GLSL minimums & maximums

[Jordan Justen]

Also, convert two glslparsertest tests to use built-in-constants.

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
---
 tests/all.py                                         |  1 +
 .../compiler/gl_MaxComputeWorkGroupCount.comp        | 20 --------------------
 .../compiler/gl_MaxComputeWorkGroupSize.comp         | 20 --------------------
 tests/spec/arb_compute_shader/minimum-maximums.txt   | 14 ++++++++++++++
 4 files changed, 15 insertions(+), 40 deletions(-)
 delete mode 100644 tests/spec/arb_compute_shader/compiler/gl_MaxComputeWorkGroupCount.comp
 delete mode 100644 tests/spec/arb_compute_shader/compiler/gl_MaxComputeWorkGroupSize.comp
 create mode 100644 tests/spec/arb_compute_shader/minimum-maximums.txt

diff --git a/tests/all.py b/tests/all.py
index a13d878..30e461e 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -3175,6 +3175,7 @@ add_shader_test_dir(spec['ARB_compute_shader'],
 import_glsl_parser_tests(spec['ARB_compute_shader'],
                          os.path.join(testsDir, 'spec', 'arb_compute_shader'),
                          ['compiler'])
+spec['ARB_compute_shader']['built-in constants'] = concurrent_test('built-in-constants tests/spec/arb_compute_shader/minimum-maximums.txt')
 
 # group glslparsertest ------------------------------------------------------
 glslparsertest = {}
diff --git a/tests/spec/arb_compute_shader/compiler/gl_MaxComputeWorkGroupCount.comp b/tests/spec/arb_compute_shader/compiler/gl_MaxComputeWorkGroupCount.comp
deleted file mode 100644
index f8da3e2..0000000
--- a/tests/spec/arb_compute_shader/compiler/gl_MaxComputeWorkGroupCount.comp
+++ /dev/null
@@ -1,20 +0,0 @@
-// [config]
-// expect_result: pass
-// glsl_version: 3.30
-// require_extensions: GL_ARB_compute_shader
-// [end config]
-//
-// Test the minimum values for gl_MaxComputeWorkGroupCount specified
-// in ARB_compute_shader.
-
-#version 330
-#extension GL_ARB_compute_shader: enable
-
-layout(local_size_x = 1) in;
-
-void main()
-{
-  int x[gl_MaxComputeWorkGroupCount.x >= 65535 ? 1 : -1];
-  int y[gl_MaxComputeWorkGroupCount.y >= 65535 ? 1 : -1];
-  int z[gl_MaxComputeWorkGroupCount.z >= 65535 ? 1 : -1];
-}
diff --git a/tests/spec/arb_compute_shader/compiler/gl_MaxComputeWorkGroupSize.comp b/tests/spec/arb_compute_shader/compiler/gl_MaxComputeWorkGroupSize.comp
deleted file mode 100644
index 8291dd8..0000000
--- a/tests/spec/arb_compute_shader/compiler/gl_MaxComputeWorkGroupSize.comp
+++ /dev/null
@@ -1,20 +0,0 @@
-// [config]
-// expect_result: pass
-// glsl_version: 3.30
-// require_extensions: GL_ARB_compute_shader
-// [end config]
-//
-// Test the minimum values for gl_MaxComputeWorkGroupSize specified in
-// ARB_compute_shader.
-
-#version 330
-#extension GL_ARB_compute_shader: enable
-
-layout(local_size_x = 1) in;
-
-void main()
-{
-  int x[gl_MaxComputeWorkGroupSize.x >= 1024 ? 1 : -1];
-  int y[gl_MaxComputeWorkGroupSize.y >= 1024 ? 1 : -1];
-  int z[gl_MaxComputeWorkGroupSize.z >= 64 ? 1 : -1];
-}
diff --git a/tests/spec/arb_compute_shader/minimum-maximums.txt b/tests/spec/arb_compute_shader/minimum-maximums.txt
new file mode 100644
index 0000000..3d55c8f
--- /dev/null
+++ b/tests/spec/arb_compute_shader/minimum-maximums.txt
@@ -0,0 +1,14 @@
+3.30
+GL_COMPUTE_SHADER
+GL_ARB_compute_shader
+gl_MaxComputeWorkGroupCount.x 65535
+gl_MaxComputeWorkGroupCount.y 65535
+gl_MaxComputeWorkGroupCount.z 65535
+gl_MaxComputeWorkGroupSize.x 1024
+gl_MaxComputeWorkGroupSize.y 1024
+gl_MaxComputeWorkGroupSize.z 64
+gl_MaxComputeUniformComponents 1024
+gl_MaxComputeTextureImageUnits 16
+gl_MaxComputeImageUniforms 8
+gl_MaxComputeAtomicCounters 8
+gl_MaxComputeAtomicCounterBuffers 1
-- 
2.0.0.rc4