util: Add fields to piglit_gl_test_config for listing supported GL flavors (v2)

This patch has 3 interrelated components.

1) Add the following fields to piglit_gl_test_config:
    supports_gl_core_version
    supports_gl_compat_version
    supports_gl_es1
    supports_gl_es2

These allow a test to specify what GL flavors under which it can run.  For
details, see the documentation for struct piglit_gl_test_config.

2. In tests/util/piglit-framework-gl, implement support for the new
fields.

3. In each GL test source, add one of the new fields to the
PIGLIT_GL_TEST_CONFIG_BEGIN/END block.

For GLES1 tests, add `supports_gl_es1 = true`. For GLES2 tests, add
`supports_gl_es2 = true`.  For desktop GL tests, add
`supports_gl_compat_version = 10`. For an explanation of why version 1.0
is used for desktop GL tests, see the documentation for
supports_gl_compat_version. No tests yet require a GL core context.

v2: Replace silly sum of booleans with a logical conjuction. For Anholt.

Reviewed-and-tested-by: Jordan Justen <jordan.l.justen@intel.com>
Tested-by: Paul Berry <stereotype441@gmail.com>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

24 files changed, 48 insertions, 0 deletions

diff --git a/tests/hiz/hiz-depth-read-fbo-d24-s0.c b/tests/hiz/hiz-depth-read-fbo-d24-s0.c
index a35d2d003..0b1ec3304 100644
--- a/tests/hiz/hiz-depth-read-fbo-d24-s0.c
+++ b/tests/hiz/hiz-depth-read-fbo-d24-s0.c
@@ -35,6 +35,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB;
diff --git a/tests/hiz/hiz-depth-read-fbo-d24-s8.c b/tests/hiz/hiz-depth-read-fbo-d24-s8.c
index 7e35b384f..230b06053 100644
--- a/tests/hiz/hiz-depth-read-fbo-d24-s8.c
+++ b/tests/hiz/hiz-depth-read-fbo-d24-s8.c
@@ -36,6 +36,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB;
diff --git a/tests/hiz/hiz-depth-read-fbo-d24s8.c b/tests/hiz/hiz-depth-read-fbo-d24s8.c
index 8ab92fbf8..b680b9f81 100644
--- a/tests/hiz/hiz-depth-read-fbo-d24s8.c
+++ b/tests/hiz/hiz-depth-read-fbo-d24s8.c
@@ -35,6 +35,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB;
diff --git a/tests/hiz/hiz-depth-read-window-stencil0.c b/tests/hiz/hiz-depth-read-window-stencil0.c
index 159cd8f67..4512be527 100644
--- a/tests/hiz/hiz-depth-read-window-stencil0.c
+++ b/tests/hiz/hiz-depth-read-window-stencil0.c
@@ -33,6 +33,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DEPTH;
diff --git a/tests/hiz/hiz-depth-read-window-stencil1.c b/tests/hiz/hiz-depth-read-window-stencil1.c
index 02626774e..889422ff8 100644
--- a/tests/hiz/hiz-depth-read-window-stencil1.c
+++ b/tests/hiz/hiz-depth-read-window-stencil1.c
@@ -33,6 +33,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL;
diff --git a/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c b/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c
index 4f30b3a7d..0bc9f74d4 100644
--- a/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c
+++ b/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c
@@ -43,6 +43,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB;
diff --git a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c
index efe228983..969f87aab 100644
--- a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c
+++ b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c
@@ -43,6 +43,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB;
diff --git a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c
index 5ff534561..fa6813412 100644
--- a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c
+++ b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c
@@ -44,6 +44,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB;
diff --git a/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c b/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c
index 302f1a74e..623099311 100644
--- a/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c
+++ b/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c
@@ -43,6 +43,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB;
diff --git a/tests/hiz/hiz-depth-test-fbo-d24-s0.c b/tests/hiz/hiz-depth-test-fbo-d24-s0.c
index ff79b78b8..534c59644 100644
--- a/tests/hiz/hiz-depth-test-fbo-d24-s0.c
+++ b/tests/hiz/hiz-depth-test-fbo-d24-s0.c
@@ -40,6 +40,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB;
diff --git a/tests/hiz/hiz-depth-test-fbo-d24-s8.c b/tests/hiz/hiz-depth-test-fbo-d24-s8.c
index 298454e68..ea12337da 100644
--- a/tests/hiz/hiz-depth-test-fbo-d24-s8.c
+++ b/tests/hiz/hiz-depth-test-fbo-d24-s8.c
@@ -41,6 +41,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB;
diff --git a/tests/hiz/hiz-depth-test-fbo-d24s8.c b/tests/hiz/hiz-depth-test-fbo-d24s8.c
index 4c66779af..a66b847f3 100644
--- a/tests/hiz/hiz-depth-test-fbo-d24s8.c
+++ b/tests/hiz/hiz-depth-test-fbo-d24s8.c
@@ -40,6 +40,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB;
diff --git a/tests/hiz/hiz-depth-test-window-stencil0.c b/tests/hiz/hiz-depth-test-window-stencil0.c
index 679a23040..34012d2a3 100644
--- a/tests/hiz/hiz-depth-test-window-stencil0.c
+++ b/tests/hiz/hiz-depth-test-window-stencil0.c
@@ -37,6 +37,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DEPTH;
diff --git a/tests/hiz/hiz-depth-test-window-stencil1.c b/tests/hiz/hiz-depth-test-window-stencil1.c
index a6ae6ac64..8727dcaf6 100644
--- a/tests/hiz/hiz-depth-test-window-stencil1.c
+++ b/tests/hiz/hiz-depth-test-window-stencil1.c
@@ -37,6 +37,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL;
diff --git a/tests/hiz/hiz-stencil-read-fbo-d0-s8.c b/tests/hiz/hiz-stencil-read-fbo-d0-s8.c
index 9a3c29105..88b9194c2 100644
--- a/tests/hiz/hiz-stencil-read-fbo-d0-s8.c
+++ b/tests/hiz/hiz-stencil-read-fbo-d0-s8.c
@@ -41,6 +41,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB;
diff --git a/tests/hiz/hiz-stencil-read-fbo-d24-s8.c b/tests/hiz/hiz-stencil-read-fbo-d24-s8.c
index b281c91f4..8c70dbd93 100644
--- a/tests/hiz/hiz-stencil-read-fbo-d24-s8.c
+++ b/tests/hiz/hiz-stencil-read-fbo-d24-s8.c
@@ -42,6 +42,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB;
diff --git a/tests/hiz/hiz-stencil-read-fbo-d24s8.c b/tests/hiz/hiz-stencil-read-fbo-d24s8.c
index 87c4d33b6..440020690 100644
--- a/tests/hiz/hiz-stencil-read-fbo-d24s8.c
+++ b/tests/hiz/hiz-stencil-read-fbo-d24s8.c
@@ -41,6 +41,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB;
diff --git a/tests/hiz/hiz-stencil-read-window-depth0.c b/tests/hiz/hiz-stencil-read-window-depth0.c
index 63e77dff2..e16ed2306 100644
--- a/tests/hiz/hiz-stencil-read-window-depth0.c
+++ b/tests/hiz/hiz-stencil-read-window-depth0.c
@@ -39,6 +39,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_STENCIL;
diff --git a/tests/hiz/hiz-stencil-read-window-depth1.c b/tests/hiz/hiz-stencil-read-window-depth1.c
index d7ebaa6f0..a04adc109 100644
--- a/tests/hiz/hiz-stencil-read-window-depth1.c
+++ b/tests/hiz/hiz-stencil-read-window-depth1.c
@@ -39,6 +39,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_STENCIL | PIGLIT_GL_VISUAL_DEPTH;
diff --git a/tests/hiz/hiz-stencil-test-fbo-d0-s8.c b/tests/hiz/hiz-stencil-test-fbo-d0-s8.c
index 1f6aa5346..285de4c81 100644
--- a/tests/hiz/hiz-stencil-test-fbo-d0-s8.c
+++ b/tests/hiz/hiz-stencil-test-fbo-d0-s8.c
@@ -40,6 +40,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB;
diff --git a/tests/hiz/hiz-stencil-test-fbo-d24-s8.c b/tests/hiz/hiz-stencil-test-fbo-d24-s8.c
index 685e9ce4e..d2a075dc8 100644
--- a/tests/hiz/hiz-stencil-test-fbo-d24-s8.c
+++ b/tests/hiz/hiz-stencil-test-fbo-d24-s8.c
@@ -41,6 +41,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB;
diff --git a/tests/hiz/hiz-stencil-test-fbo-d24s8.c b/tests/hiz/hiz-stencil-test-fbo-d24s8.c
index 86de596aa..d01116dbf 100644
--- a/tests/hiz/hiz-stencil-test-fbo-d24s8.c
+++ b/tests/hiz/hiz-stencil-test-fbo-d24s8.c
@@ -40,6 +40,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB;
diff --git a/tests/hiz/hiz-stencil-test-window-depth0.c b/tests/hiz/hiz-stencil-test-window-depth0.c
index d61d5d118..d873324d3 100644
--- a/tests/hiz/hiz-stencil-test-window-depth0.c
+++ b/tests/hiz/hiz-stencil-test-window-depth0.c
@@ -37,6 +37,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_STENCIL;
diff --git a/tests/hiz/hiz-stencil-test-window-depth1.c b/tests/hiz/hiz-stencil-test-window-depth1.c
index 90ebfaa31..5b2c8ad1a 100644
--- a/tests/hiz/hiz-stencil-test-window-depth1.c
+++ b/tests/hiz/hiz-stencil-test-window-depth1.c
@@ -37,6 +37,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 400;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_STENCIL | PIGLIT_GL_VISUAL_DEPTH;