[waffle] [PATCH 3/8] test/gl_basic_test: introduce linux_gl(30_core - 43_compat) tests

Emil Velikov emil.l.velikov at gmail.com
Mon Aug 4 07:34:18 PDT 2014


The EGL, GLX (and WGL spec) are identical wrt 3.0+ context and it
makes little sense to have the very same tests three times.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 tests/functional/gl_basic_test.c | 594 ++++++++++++---------------------------
 1 file changed, 183 insertions(+), 411 deletions(-)

diff --git a/tests/functional/gl_basic_test.c b/tests/functional/gl_basic_test.c
index 95799d2..b55883e 100644
--- a/tests/functional/gl_basic_test.c
+++ b/tests/functional/gl_basic_test.c
@@ -424,6 +424,129 @@ TEST(gl_basic, all_gl21_fwdcompat_bad_attribute)
 }
 
 
+//
+// List of linux (glx, wayland and x11_egl) specific tests.
+//
+#if defined(WAFFLE_HAS_GLX) || defined(WAFFLE_HAS_WAYLAND) || defined(WAFFLE_HAS_X11_EGL)
+TEST(gl_basic, linux_gl30)
+{
+    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+                  .version=30);
+}
+
+TEST(gl_basic, linux_gl30_fwdcompat)
+{
+    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+                  .version=30,
+                  .forward_compatible=true);
+}
+
+TEST(gl_basic, linux_gl31)
+{
+    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+                  .version=31);
+}
+
+TEST(gl_basic, linux_gl31_fwdcompat)
+{
+    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+                  .version=31,
+                  .forward_compatible=true);
+}
+
+TEST(gl_basic, linux_gl32_core)
+{
+    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+                  .version=32,
+                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
+}
+
+TEST(gl_basic, linux_gl32_core_fwdcompat)
+{
+    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+                  .version=32,
+                  .profile=WAFFLE_CONTEXT_CORE_PROFILE,
+                  .forward_compatible=true);
+}
+
+TEST(gl_basic, linux_gl33_core)
+{
+    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+                  .version=33,
+                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
+}
+
+TEST(gl_basic, linux_gl40_core)
+{
+    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+                  .version=40,
+                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
+}
+
+TEST(gl_basic, linux_gl41_core)
+{
+    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+                  .version=41,
+                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
+}
+
+TEST(gl_basic, linux_gl42_core)
+{
+    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+                  .version=42,
+                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
+}
+
+TEST(gl_basic, linux_gl43_core)
+{
+    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+                  .version=43,
+                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
+}
+
+TEST(gl_basic, linux_gl32_compat)
+{
+    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+                  .version=32,
+                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
+}
+
+TEST(gl_basic, linux_gl33_compat)
+{
+    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+                  .version=33,
+                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
+}
+
+TEST(gl_basic, linux_gl40_compat)
+{
+    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+                  .version=40,
+                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
+}
+
+TEST(gl_basic, linux_gl41_compat)
+{
+    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+                  .version=41,
+                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
+}
+
+TEST(gl_basic, linux_gl42_compat)
+{
+    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+                  .version=42,
+                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
+}
+
+TEST(gl_basic, linux_gl43_compat)
+{
+    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+                  .version=43,
+                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
+}
+#endif
+
 #ifdef WAFFLE_HAS_CGL
 TEST(gl_basic, cgl_init)
 {
@@ -625,124 +748,6 @@ TEST(gl_basic, glx_gl_fwdcompat_bad_attribute)
                   .expect_error=WAFFLE_ERROR_BAD_ATTRIBUTE);
 }
 
-TEST(gl_basic, glx_gl30)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=30);
-}
-
-TEST(gl_basic, glx_gl30_fwdcompat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=30,
-                  .forward_compatible=true);
-}
-
-TEST(gl_basic, glx_gl31)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=31);
-}
-
-TEST(gl_basic, glx_gl31_fwdcompat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=31,
-                  .forward_compatible=true);
-}
-
-TEST(gl_basic, glx_gl32_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=32,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, glx_gl32_core_fwdcompat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=32,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE,
-                  .forward_compatible=true);
-}
-
-TEST(gl_basic, glx_gl33_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=33,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, glx_gl40_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=40,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, glx_gl41_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=41,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, glx_gl42_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=42,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, glx_gl43_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=43,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, glx_gl32_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=32,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
-TEST(gl_basic, glx_gl33_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=33,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
-TEST(gl_basic, glx_gl40_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=40,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
-TEST(gl_basic, glx_gl41_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=41,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
-TEST(gl_basic, glx_gl42_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=42,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
-TEST(gl_basic, glx_gl43_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=43,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
 TEST(gl_basic, glx_gles1_rgb)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES1);
@@ -842,25 +847,26 @@ testsuite_glx(void)
     TEST_RUN(gl_basic, all_gl20);
     TEST_RUN(gl_basic, all_gl21);
     TEST_RUN(gl_basic, all_gl21_fwdcompat_bad_attribute);
-    TEST_RUN(gl_basic, glx_gl30);
-    TEST_RUN(gl_basic, glx_gl30_fwdcompat);
-    TEST_RUN(gl_basic, glx_gl31);
-    TEST_RUN(gl_basic, glx_gl31_fwdcompat);
-
-    TEST_RUN(gl_basic, glx_gl32_core);
-    TEST_RUN(gl_basic, glx_gl32_core_fwdcompat);
-    TEST_RUN(gl_basic, glx_gl33_core);
-    TEST_RUN(gl_basic, glx_gl40_core);
-    TEST_RUN(gl_basic, glx_gl41_core);
-    TEST_RUN(gl_basic, glx_gl42_core);
-    TEST_RUN(gl_basic, glx_gl43_core);
-
-    TEST_RUN(gl_basic, glx_gl32_compat);
-    TEST_RUN(gl_basic, glx_gl33_compat);
-    TEST_RUN(gl_basic, glx_gl40_compat);
-    TEST_RUN(gl_basic, glx_gl41_compat);
-    TEST_RUN(gl_basic, glx_gl42_compat);
-    TEST_RUN(gl_basic, glx_gl43_compat);
+
+    TEST_RUN(gl_basic, linux_gl30);
+    TEST_RUN(gl_basic, linux_gl30_fwdcompat);
+    TEST_RUN(gl_basic, linux_gl31);
+    TEST_RUN(gl_basic, linux_gl31_fwdcompat);
+
+    TEST_RUN(gl_basic, linux_gl32_core);
+    TEST_RUN(gl_basic, linux_gl32_core_fwdcompat);
+    TEST_RUN(gl_basic, linux_gl33_core);
+    TEST_RUN(gl_basic, linux_gl40_core);
+    TEST_RUN(gl_basic, linux_gl41_core);
+    TEST_RUN(gl_basic, linux_gl42_core);
+    TEST_RUN(gl_basic, linux_gl43_core);
+
+    TEST_RUN(gl_basic, linux_gl32_compat);
+    TEST_RUN(gl_basic, linux_gl33_compat);
+    TEST_RUN(gl_basic, linux_gl40_compat);
+    TEST_RUN(gl_basic, linux_gl41_compat);
+    TEST_RUN(gl_basic, linux_gl42_compat);
+    TEST_RUN(gl_basic, linux_gl43_compat);
 
     TEST_RUN(gl_basic, glx_gles1_rgb);
     TEST_RUN(gl_basic, glx_gles1_rgba);
@@ -902,124 +908,6 @@ TEST(gl_basic, wayland_gl_fwdcompat_bad_attribute)
                   .expect_error=WAFFLE_ERROR_BAD_ATTRIBUTE);
 }
 
-TEST(gl_basic, wayland_gl30)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=30);
-}
-
-TEST(gl_basic, wayland_gl30_fwdcompat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=30,
-                  .forward_compatible=true);
-}
-
-TEST(gl_basic, wayland_gl31)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=31);
-}
-
-TEST(gl_basic, wayland_gl31_fwdcompat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=31,
-                  .forward_compatible=true);
-}
-
-TEST(gl_basic, wayland_gl32_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=32,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, wayland_gl32_core_fwdcompat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=32,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE,
-                  .forward_compatible=true);
-}
-
-TEST(gl_basic, wayland_gl33_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=33,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, wayland_gl40_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=40,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, wayland_gl41_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=41,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, wayland_gl42_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=42,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, wayland_gl43_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=43,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, wayland_gl32_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=32,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
-TEST(gl_basic, wayland_gl33_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=33,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
-TEST(gl_basic, wayland_gl40_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=40,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
-TEST(gl_basic, wayland_gl41_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=41,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
-TEST(gl_basic, wayland_gl42_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=42,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
-TEST(gl_basic, wayland_gl43_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=43,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
 TEST(gl_basic, wayland_gles1_rgb)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES1);
@@ -1120,25 +1008,26 @@ testsuite_wayland(void)
     TEST_RUN(gl_basic, all_gl20);
     TEST_RUN(gl_basic, all_gl21);
     TEST_RUN(gl_basic, all_gl21_fwdcompat_bad_attribute);
-    TEST_RUN(gl_basic, wayland_gl30);
-    TEST_RUN(gl_basic, wayland_gl30_fwdcompat);
-    TEST_RUN(gl_basic, wayland_gl31);
-    TEST_RUN(gl_basic, wayland_gl31_fwdcompat);
-
-    TEST_RUN(gl_basic, wayland_gl32_core);
-    TEST_RUN(gl_basic, wayland_gl32_core_fwdcompat);
-    TEST_RUN(gl_basic, wayland_gl33_core);
-    TEST_RUN(gl_basic, wayland_gl40_core);
-    TEST_RUN(gl_basic, wayland_gl41_core);
-    TEST_RUN(gl_basic, wayland_gl42_core);
-    TEST_RUN(gl_basic, wayland_gl43_core);
-
-    TEST_RUN(gl_basic, wayland_gl32_compat);
-    TEST_RUN(gl_basic, wayland_gl33_compat);
-    TEST_RUN(gl_basic, wayland_gl40_compat);
-    TEST_RUN(gl_basic, wayland_gl41_compat);
-    TEST_RUN(gl_basic, wayland_gl42_compat);
-    TEST_RUN(gl_basic, wayland_gl43_compat);
+
+    TEST_RUN(gl_basic, linux_gl30);
+    TEST_RUN(gl_basic, linux_gl30_fwdcompat);
+    TEST_RUN(gl_basic, linux_gl31);
+    TEST_RUN(gl_basic, linux_gl31_fwdcompat);
+
+    TEST_RUN(gl_basic, linux_gl32_core);
+    TEST_RUN(gl_basic, linux_gl32_core_fwdcompat);
+    TEST_RUN(gl_basic, linux_gl33_core);
+    TEST_RUN(gl_basic, linux_gl40_core);
+    TEST_RUN(gl_basic, linux_gl41_core);
+    TEST_RUN(gl_basic, linux_gl42_core);
+    TEST_RUN(gl_basic, linux_gl43_core);
+
+    TEST_RUN(gl_basic, linux_gl32_compat);
+    TEST_RUN(gl_basic, linux_gl33_compat);
+    TEST_RUN(gl_basic, linux_gl40_compat);
+    TEST_RUN(gl_basic, linux_gl41_compat);
+    TEST_RUN(gl_basic, linux_gl42_compat);
+    TEST_RUN(gl_basic, linux_gl43_compat);
 
     TEST_RUN(gl_basic, wayland_gles1_rgb);
     TEST_RUN(gl_basic, wayland_gles1_rgba);
@@ -1180,124 +1069,6 @@ TEST(gl_basic, x11_egl_gl_fwdcompat_bad_attribute)
                   .expect_error=WAFFLE_ERROR_BAD_ATTRIBUTE);
 }
 
-TEST(gl_basic, x11_egl_gl30)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=30);
-}
-
-TEST(gl_basic, x11_egl_gl30_fwdcompat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=30,
-                  .forward_compatible=true);
-}
-
-TEST(gl_basic, x11_egl_gl31)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=31);
-}
-
-TEST(gl_basic, x11_egl_gl31_fwdcompat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=31,
-                  .forward_compatible=true);
-}
-
-TEST(gl_basic, x11_egl_gl32_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=32,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, x11_egl_gl32_core_fwdcompat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=32,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE,
-                  .forward_compatible=true);
-}
-
-TEST(gl_basic, x11_egl_gl33_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=33,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, x11_egl_gl40_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=40,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, x11_egl_gl41_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=41,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, x11_egl_gl42_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=42,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, x11_egl_gl43_core)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=43,
-                  .profile=WAFFLE_CONTEXT_CORE_PROFILE);
-}
-
-TEST(gl_basic, x11_egl_gl32_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=32,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
-TEST(gl_basic, x11_egl_gl33_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=33,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
-TEST(gl_basic, x11_egl_gl40_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=40,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
-TEST(gl_basic, x11_egl_gl41_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=41,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
-TEST(gl_basic, x11_egl_gl42_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=42,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
-TEST(gl_basic, x11_egl_gl43_compat)
-{
-    gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
-                  .version=43,
-                  .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
-}
-
 TEST(gl_basic, x11_egl_gles1_rgb)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES1);
@@ -1397,25 +1168,26 @@ testsuite_x11_egl(void)
     TEST_RUN(gl_basic, all_gl20);
     TEST_RUN(gl_basic, all_gl21);
     TEST_RUN(gl_basic, all_gl21_fwdcompat_bad_attribute);
-    TEST_RUN(gl_basic, x11_egl_gl30);
-    TEST_RUN(gl_basic, x11_egl_gl30_fwdcompat);
-    TEST_RUN(gl_basic, x11_egl_gl31);
-    TEST_RUN(gl_basic, x11_egl_gl31_fwdcompat);
-
-    TEST_RUN(gl_basic, x11_egl_gl32_core);
-    TEST_RUN(gl_basic, x11_egl_gl32_core_fwdcompat);
-    TEST_RUN(gl_basic, x11_egl_gl33_core);
-    TEST_RUN(gl_basic, x11_egl_gl40_core);
-    TEST_RUN(gl_basic, x11_egl_gl41_core);
-    TEST_RUN(gl_basic, x11_egl_gl42_core);
-    TEST_RUN(gl_basic, x11_egl_gl43_core);
-
-    TEST_RUN(gl_basic, x11_egl_gl32_compat);
-    TEST_RUN(gl_basic, x11_egl_gl33_compat);
-    TEST_RUN(gl_basic, x11_egl_gl40_compat);
-    TEST_RUN(gl_basic, x11_egl_gl41_compat);
-    TEST_RUN(gl_basic, x11_egl_gl42_compat);
-    TEST_RUN(gl_basic, x11_egl_gl43_compat);
+
+    TEST_RUN(gl_basic, linux_gl30);
+    TEST_RUN(gl_basic, linux_gl30_fwdcompat);
+    TEST_RUN(gl_basic, linux_gl31);
+    TEST_RUN(gl_basic, linux_gl31_fwdcompat);
+
+    TEST_RUN(gl_basic, linux_gl32_core);
+    TEST_RUN(gl_basic, linux_gl32_core_fwdcompat);
+    TEST_RUN(gl_basic, linux_gl33_core);
+    TEST_RUN(gl_basic, linux_gl40_core);
+    TEST_RUN(gl_basic, linux_gl41_core);
+    TEST_RUN(gl_basic, linux_gl42_core);
+    TEST_RUN(gl_basic, linux_gl43_core);
+
+    TEST_RUN(gl_basic, linux_gl32_compat);
+    TEST_RUN(gl_basic, linux_gl33_compat);
+    TEST_RUN(gl_basic, linux_gl40_compat);
+    TEST_RUN(gl_basic, linux_gl41_compat);
+    TEST_RUN(gl_basic, linux_gl42_compat);
+    TEST_RUN(gl_basic, linux_gl43_compat);
 
     TEST_RUN(gl_basic, x11_egl_gles1_rgb);
     TEST_RUN(gl_basic, x11_egl_gles1_rgba);
-- 
2.0.2



More information about the waffle mailing list