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>

9 files changed, 18 insertions, 0 deletions

diff --git a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c
index 75b943d1e..604816ea9 100644
--- a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c
+++ b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c
@@ -33,6 +33,8 @@ uint8_t dest_data[COPY_BUFFER_SIZE];
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 400;
 	config.window_height = 300;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
diff --git a/tests/spec/arb_copy_buffer/copybuffersubdata.c b/tests/spec/arb_copy_buffer/copybuffersubdata.c
index b429a5aa8..3510fd80b 100644
--- a/tests/spec/arb_copy_buffer/copybuffersubdata.c
+++ b/tests/spec/arb_copy_buffer/copybuffersubdata.c
@@ -32,6 +32,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 100;
 	config.window_height = 100;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
diff --git a/tests/spec/arb_copy_buffer/dlist.c b/tests/spec/arb_copy_buffer/dlist.c
index f6ba09cde..d858f1f66 100644
--- a/tests/spec/arb_copy_buffer/dlist.c
+++ b/tests/spec/arb_copy_buffer/dlist.c
@@ -35,6 +35,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 100;
 	config.window_height = 100;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
diff --git a/tests/spec/arb_copy_buffer/get.c b/tests/spec/arb_copy_buffer/get.c
index fdb9fa97e..dec2fe277 100644
--- a/tests/spec/arb_copy_buffer/get.c
+++ b/tests/spec/arb_copy_buffer/get.c
@@ -30,6 +30,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 100;
 	config.window_height = 100;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
diff --git a/tests/spec/arb_copy_buffer/negative-bound-zero.c b/tests/spec/arb_copy_buffer/negative-bound-zero.c
index f8db59ffe..f410c393d 100644
--- a/tests/spec/arb_copy_buffer/negative-bound-zero.c
+++ b/tests/spec/arb_copy_buffer/negative-bound-zero.c
@@ -33,6 +33,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 100;
 	config.window_height = 100;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
diff --git a/tests/spec/arb_copy_buffer/negative-bounds.c b/tests/spec/arb_copy_buffer/negative-bounds.c
index eeaa70d68..f358c1f12 100644
--- a/tests/spec/arb_copy_buffer/negative-bounds.c
+++ b/tests/spec/arb_copy_buffer/negative-bounds.c
@@ -39,6 +39,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 100;
 	config.window_height = 100;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
diff --git a/tests/spec/arb_copy_buffer/negative-mapped.c b/tests/spec/arb_copy_buffer/negative-mapped.c
index fcc952ee6..1ddec7565 100644
--- a/tests/spec/arb_copy_buffer/negative-mapped.c
+++ b/tests/spec/arb_copy_buffer/negative-mapped.c
@@ -33,6 +33,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 100;
 	config.window_height = 100;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
diff --git a/tests/spec/arb_copy_buffer/overlap.c b/tests/spec/arb_copy_buffer/overlap.c
index 703a71f98..eb9bc4873 100644
--- a/tests/spec/arb_copy_buffer/overlap.c
+++ b/tests/spec/arb_copy_buffer/overlap.c
@@ -38,6 +38,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 100;
 	config.window_height = 100;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
diff --git a/tests/spec/arb_copy_buffer/targets.c b/tests/spec/arb_copy_buffer/targets.c
index e2fce3c50..7916ad2ec 100644
--- a/tests/spec/arb_copy_buffer/targets.c
+++ b/tests/spec/arb_copy_buffer/targets.c
@@ -49,6 +49,8 @@
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
+	config.supports_gl_compat_version = 10;
+
 	config.window_width = 100;
 	config.window_height = 100;
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;