[waffle] [PATCH 6/8] test/gl_basic_test: add PLATFORM_WGL support/tests

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


Considering how close the WGL spec is wrt GLX and EGL, we can
use the existing 'all' and 'linux' tests. Rename the latter to
'all_but_cgl' to reflect cgl's exclusivity wrt the tests.

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

diff --git a/tests/functional/gl_basic_test.c b/tests/functional/gl_basic_test.c
index 633d6be..44e37bc 100644
--- a/tests/functional/gl_basic_test.c
+++ b/tests/functional/gl_basic_test.c
@@ -425,56 +425,56 @@ TEST(gl_basic, all_gl21_fwdcompat_bad_attribute)
 
 
 //
-// List of linux (glx, wayland and x11_egl) specific tests.
+// List of linux (glx, wayland and x11_egl) and windows (wgl) specific tests.
 //
-#if defined(WAFFLE_HAS_GLX) || defined(WAFFLE_HAS_WAYLAND) || defined(WAFFLE_HAS_X11_EGL)
-TEST(gl_basic, linux_gl_debug)
+#if defined(WAFFLE_HAS_GLX) || defined(WAFFLE_HAS_WAYLAND) || defined(WAFFLE_HAS_X11_EGL) || defined(WAFFLE_HAS_WGL)
+TEST(gl_basic, all_but_cgl_gl_debug)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .debug=true);
 }
 
-TEST(gl_basic, linux_gl_fwdcompat_bad_attribute)
+TEST(gl_basic, all_but_cgl_gl_fwdcompat_bad_attribute)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .forward_compatible=true,
                   .expect_error=WAFFLE_ERROR_BAD_ATTRIBUTE);
 }
 
-TEST(gl_basic, linux_gl30)
+TEST(gl_basic, all_but_cgl_gl30)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .version=30);
 }
 
-TEST(gl_basic, linux_gl30_fwdcompat)
+TEST(gl_basic, all_but_cgl_gl30_fwdcompat)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .version=30,
                   .forward_compatible=true);
 }
 
-TEST(gl_basic, linux_gl31)
+TEST(gl_basic, all_but_cgl_gl31)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .version=31);
 }
 
-TEST(gl_basic, linux_gl31_fwdcompat)
+TEST(gl_basic, all_but_cgl_gl31_fwdcompat)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .version=31,
                   .forward_compatible=true);
 }
 
-TEST(gl_basic, linux_gl32_core)
+TEST(gl_basic, all_but_cgl_gl32_core)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .version=32,
                   .profile=WAFFLE_CONTEXT_CORE_PROFILE);
 }
 
-TEST(gl_basic, linux_gl32_core_fwdcompat)
+TEST(gl_basic, all_but_cgl_gl32_core_fwdcompat)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .version=32,
@@ -482,157 +482,157 @@ TEST(gl_basic, linux_gl32_core_fwdcompat)
                   .forward_compatible=true);
 }
 
-TEST(gl_basic, linux_gl33_core)
+TEST(gl_basic, all_but_cgl_gl33_core)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .version=33,
                   .profile=WAFFLE_CONTEXT_CORE_PROFILE);
 }
 
-TEST(gl_basic, linux_gl40_core)
+TEST(gl_basic, all_but_cgl_gl40_core)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .version=40,
                   .profile=WAFFLE_CONTEXT_CORE_PROFILE);
 }
 
-TEST(gl_basic, linux_gl41_core)
+TEST(gl_basic, all_but_cgl_gl41_core)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .version=41,
                   .profile=WAFFLE_CONTEXT_CORE_PROFILE);
 }
 
-TEST(gl_basic, linux_gl42_core)
+TEST(gl_basic, all_but_cgl_gl42_core)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .version=42,
                   .profile=WAFFLE_CONTEXT_CORE_PROFILE);
 }
 
-TEST(gl_basic, linux_gl43_core)
+TEST(gl_basic, all_but_cgl_gl43_core)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .version=43,
                   .profile=WAFFLE_CONTEXT_CORE_PROFILE);
 }
 
-TEST(gl_basic, linux_gl32_compat)
+TEST(gl_basic, all_but_cgl_gl32_compat)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .version=32,
                   .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
 }
 
-TEST(gl_basic, linux_gl33_compat)
+TEST(gl_basic, all_but_cgl_gl33_compat)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .version=33,
                   .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
 }
 
-TEST(gl_basic, linux_gl40_compat)
+TEST(gl_basic, all_but_cgl_gl40_compat)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .version=40,
                   .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
 }
 
-TEST(gl_basic, linux_gl41_compat)
+TEST(gl_basic, all_but_cgl_gl41_compat)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .version=41,
                   .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
 }
 
-TEST(gl_basic, linux_gl42_compat)
+TEST(gl_basic, all_but_cgl_gl42_compat)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .version=42,
                   .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
 }
 
-TEST(gl_basic, linux_gl43_compat)
+TEST(gl_basic, all_but_cgl_gl43_compat)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
                   .version=43,
                   .profile=WAFFLE_CONTEXT_COMPATIBILITY_PROFILE);
 }
 
-TEST(gl_basic, linux_gles1_rgb)
+TEST(gl_basic, all_but_cgl_gles1_rgb)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES1);
 }
 
-TEST(gl_basic, linux_gles1_rgba)
+TEST(gl_basic, all_but_cgl_gles1_rgba)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES1,
                   .alpha=true);
 }
 
-TEST(gl_basic, linux_gles10)
+TEST(gl_basic, all_but_cgl_gles10)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES1,
                   .version=10,
                   .alpha=true);
 }
 
-TEST(gl_basic, linux_gles11)
+TEST(gl_basic, all_but_cgl_gles11)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES1,
                   .version=11,
                   .alpha=true);
 }
 
-TEST(gl_basic, linux_gles1_fwdcompat_bad_attribute)
+TEST(gl_basic, all_but_cgl_gles1_fwdcompat_bad_attribute)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES1,
                   .forward_compatible=true,
                   .expect_error=WAFFLE_ERROR_BAD_ATTRIBUTE);
 }
 
-TEST(gl_basic, linux_gles2_rgb)
+TEST(gl_basic, all_but_cgl_gles2_rgb)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES2);
 }
 
-TEST(gl_basic, linux_gles2_rgba)
+TEST(gl_basic, all_but_cgl_gles2_rgba)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES2,
                   .alpha=true);
 }
 
-TEST(gl_basic, linux_gles20)
+TEST(gl_basic, all_but_cgl_gles20)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES2,
                   .version=20);
 }
 
-TEST(gl_basic, linux_gles2_fwdcompat_bad_attribute)
+TEST(gl_basic, all_but_cgl_gles2_fwdcompat_bad_attribute)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES2,
                   .forward_compatible=true,
                   .expect_error=WAFFLE_ERROR_BAD_ATTRIBUTE);
 }
 
-TEST(gl_basic, linux_gles3_rgb)
+TEST(gl_basic, all_but_cgl_gles3_rgb)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES3);
 }
 
-TEST(gl_basic, linux_gles3_rgba)
+TEST(gl_basic, all_but_cgl_gles3_rgba)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES3,
                   .alpha=true);
 }
 
-TEST(gl_basic, linux_gles30)
+TEST(gl_basic, all_but_cgl_gles30)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES3,
                   .version=30);
 }
 
-TEST(gl_basic, linux_gles3_fwdcompat_bad_attribute)
+TEST(gl_basic, all_but_cgl_gles3_fwdcompat_bad_attribute)
 {
     gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES3,
                   .forward_compatible=true,
@@ -835,8 +835,8 @@ testsuite_glx(void)
 
     TEST_RUN(gl_basic, all_gl_rgb);
     TEST_RUN(gl_basic, all_gl_rgba);
-    TEST_RUN(gl_basic, linux_gl_debug);
-    TEST_RUN(gl_basic, linux_gl_fwdcompat_bad_attribute);
+    TEST_RUN(gl_basic, all_but_cgl_gl_debug);
+    TEST_RUN(gl_basic, all_but_cgl_gl_fwdcompat_bad_attribute);
 
     TEST_RUN(gl_basic, all_gl10);
     TEST_RUN(gl_basic, all_gl11);
@@ -848,44 +848,44 @@ testsuite_glx(void)
     TEST_RUN(gl_basic, all_gl21);
     TEST_RUN(gl_basic, all_gl21_fwdcompat_bad_attribute);
 
-    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, all_but_cgl_gl30);
+    TEST_RUN(gl_basic, all_but_cgl_gl30_fwdcompat);
+    TEST_RUN(gl_basic, all_but_cgl_gl31);
+    TEST_RUN(gl_basic, all_but_cgl_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, all_but_cgl_gl32_core);
+    TEST_RUN(gl_basic, all_but_cgl_gl32_core_fwdcompat);
+    TEST_RUN(gl_basic, all_but_cgl_gl33_core);
+    TEST_RUN(gl_basic, all_but_cgl_gl40_core);
+    TEST_RUN(gl_basic, all_but_cgl_gl41_core);
+    TEST_RUN(gl_basic, all_but_cgl_gl42_core);
+    TEST_RUN(gl_basic, all_but_cgl_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, all_but_cgl_gl32_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl33_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl40_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl41_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl42_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl43_compat);
 
-    TEST_RUN(gl_basic, linux_gles1_rgb);
-    TEST_RUN(gl_basic, linux_gles1_rgba);
-    TEST_RUN(gl_basic, linux_gles1_fwdcompat_bad_attribute);
+    TEST_RUN(gl_basic, all_but_cgl_gles1_rgb);
+    TEST_RUN(gl_basic, all_but_cgl_gles1_rgba);
+    TEST_RUN(gl_basic, all_but_cgl_gles1_fwdcompat_bad_attribute);
 
-    TEST_RUN(gl_basic, linux_gles10);
-    TEST_RUN(gl_basic, linux_gles11);
+    TEST_RUN(gl_basic, all_but_cgl_gles10);
+    TEST_RUN(gl_basic, all_but_cgl_gles11);
 
-    TEST_RUN(gl_basic, linux_gles2_rgb);
-    TEST_RUN(gl_basic, linux_gles2_rgba);
-    TEST_RUN(gl_basic, linux_gles2_fwdcompat_bad_attribute);
+    TEST_RUN(gl_basic, all_but_cgl_gles2_rgb);
+    TEST_RUN(gl_basic, all_but_cgl_gles2_rgba);
+    TEST_RUN(gl_basic, all_but_cgl_gles2_fwdcompat_bad_attribute);
 
-    TEST_RUN(gl_basic, linux_gles20);
+    TEST_RUN(gl_basic, all_but_cgl_gles20);
 
-    TEST_RUN(gl_basic, linux_gles3_rgb);
-    TEST_RUN(gl_basic, linux_gles3_rgba);
-    TEST_RUN(gl_basic, linux_gles3_fwdcompat_bad_attribute);
+    TEST_RUN(gl_basic, all_but_cgl_gles3_rgb);
+    TEST_RUN(gl_basic, all_but_cgl_gles3_rgba);
+    TEST_RUN(gl_basic, all_but_cgl_gles3_fwdcompat_bad_attribute);
 
-    TEST_RUN(gl_basic, linux_gles30);
+    TEST_RUN(gl_basic, all_but_cgl_gles30);
 }
 #endif // WAFFLE_HAS_GLX
 
@@ -903,8 +903,8 @@ testsuite_wayland(void)
     TEST_RUN(gl_basic, all_gl_rgb);
     TEST_RUN(gl_basic, all_gl_rgba);
 
-    TEST_RUN(gl_basic, linux_gl_debug);
-    TEST_RUN(gl_basic, linux_gl_fwdcompat_bad_attribute);
+    TEST_RUN(gl_basic, all_but_cgl_gl_debug);
+    TEST_RUN(gl_basic, all_but_cgl_gl_fwdcompat_bad_attribute);
 
     TEST_RUN(gl_basic, all_gl10);
     TEST_RUN(gl_basic, all_gl11);
@@ -916,44 +916,44 @@ testsuite_wayland(void)
     TEST_RUN(gl_basic, all_gl21);
     TEST_RUN(gl_basic, all_gl21_fwdcompat_bad_attribute);
 
-    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, all_but_cgl_gl30);
+    TEST_RUN(gl_basic, all_but_cgl_gl30_fwdcompat);
+    TEST_RUN(gl_basic, all_but_cgl_gl31);
+    TEST_RUN(gl_basic, all_but_cgl_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, all_but_cgl_gl32_core);
+    TEST_RUN(gl_basic, all_but_cgl_gl32_core_fwdcompat);
+    TEST_RUN(gl_basic, all_but_cgl_gl33_core);
+    TEST_RUN(gl_basic, all_but_cgl_gl40_core);
+    TEST_RUN(gl_basic, all_but_cgl_gl41_core);
+    TEST_RUN(gl_basic, all_but_cgl_gl42_core);
+    TEST_RUN(gl_basic, all_but_cgl_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, all_but_cgl_gl32_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl33_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl40_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl41_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl42_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl43_compat);
 
-    TEST_RUN(gl_basic, linux_gles1_rgb);
-    TEST_RUN(gl_basic, linux_gles1_rgba);
-    TEST_RUN(gl_basic, linux_gles1_fwdcompat_bad_attribute);
+    TEST_RUN(gl_basic, all_but_cgl_gles1_rgb);
+    TEST_RUN(gl_basic, all_but_cgl_gles1_rgba);
+    TEST_RUN(gl_basic, all_but_cgl_gles1_fwdcompat_bad_attribute);
 
-    TEST_RUN(gl_basic, linux_gles10);
-    TEST_RUN(gl_basic, linux_gles11);
+    TEST_RUN(gl_basic, all_but_cgl_gles10);
+    TEST_RUN(gl_basic, all_but_cgl_gles11);
 
-    TEST_RUN(gl_basic, linux_gles2_rgb);
-    TEST_RUN(gl_basic, linux_gles2_rgba);
-    TEST_RUN(gl_basic, linux_gles2_fwdcompat_bad_attribute);
+    TEST_RUN(gl_basic, all_but_cgl_gles2_rgb);
+    TEST_RUN(gl_basic, all_but_cgl_gles2_rgba);
+    TEST_RUN(gl_basic, all_but_cgl_gles2_fwdcompat_bad_attribute);
 
-    TEST_RUN(gl_basic, linux_gles20);
+    TEST_RUN(gl_basic, all_but_cgl_gles20);
 
-    TEST_RUN(gl_basic, linux_gles3_rgb);
-    TEST_RUN(gl_basic, linux_gles3_rgba);
-    TEST_RUN(gl_basic, linux_gles3_fwdcompat_bad_attribute);
+    TEST_RUN(gl_basic, all_but_cgl_gles3_rgb);
+    TEST_RUN(gl_basic, all_but_cgl_gles3_rgba);
+    TEST_RUN(gl_basic, all_but_cgl_gles3_fwdcompat_bad_attribute);
 
-    TEST_RUN(gl_basic, linux_gles30);
+    TEST_RUN(gl_basic, all_but_cgl_gles30);
 }
 #endif // WAFFLE_HAS_WAYLAND
 
@@ -970,8 +970,8 @@ testsuite_x11_egl(void)
 
     TEST_RUN(gl_basic, all_gl_rgb);
     TEST_RUN(gl_basic, all_gl_rgba);
-    TEST_RUN(gl_basic, linux_gl_debug);
-    TEST_RUN(gl_basic, linux_gl_fwdcompat_bad_attribute);
+    TEST_RUN(gl_basic, all_but_cgl_gl_debug);
+    TEST_RUN(gl_basic, all_but_cgl_gl_fwdcompat_bad_attribute);
 
     TEST_RUN(gl_basic, all_gl10);
     TEST_RUN(gl_basic, all_gl11);
@@ -983,47 +983,114 @@ testsuite_x11_egl(void)
     TEST_RUN(gl_basic, all_gl21);
     TEST_RUN(gl_basic, all_gl21_fwdcompat_bad_attribute);
 
-    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, all_but_cgl_gl30);
+    TEST_RUN(gl_basic, all_but_cgl_gl30_fwdcompat);
+    TEST_RUN(gl_basic, all_but_cgl_gl31);
+    TEST_RUN(gl_basic, all_but_cgl_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, all_but_cgl_gl32_core);
+    TEST_RUN(gl_basic, all_but_cgl_gl32_core_fwdcompat);
+    TEST_RUN(gl_basic, all_but_cgl_gl33_core);
+    TEST_RUN(gl_basic, all_but_cgl_gl40_core);
+    TEST_RUN(gl_basic, all_but_cgl_gl41_core);
+    TEST_RUN(gl_basic, all_but_cgl_gl42_core);
+    TEST_RUN(gl_basic, all_but_cgl_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, all_but_cgl_gl32_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl33_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl40_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl41_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl42_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl43_compat);
 
-    TEST_RUN(gl_basic, linux_gles1_rgb);
-    TEST_RUN(gl_basic, linux_gles1_rgba);
-    TEST_RUN(gl_basic, linux_gles1_fwdcompat_bad_attribute);
+    TEST_RUN(gl_basic, all_but_cgl_gles1_rgb);
+    TEST_RUN(gl_basic, all_but_cgl_gles1_rgba);
+    TEST_RUN(gl_basic, all_but_cgl_gles1_fwdcompat_bad_attribute);
 
-    TEST_RUN(gl_basic, linux_gles10);
-    TEST_RUN(gl_basic, linux_gles11);
+    TEST_RUN(gl_basic, all_but_cgl_gles10);
+    TEST_RUN(gl_basic, all_but_cgl_gles11);
 
-    TEST_RUN(gl_basic, linux_gles2_rgb);
-    TEST_RUN(gl_basic, linux_gles2_rgba);
-    TEST_RUN(gl_basic, linux_gles2_fwdcompat_bad_attribute);
+    TEST_RUN(gl_basic, all_but_cgl_gles2_rgb);
+    TEST_RUN(gl_basic, all_but_cgl_gles2_rgba);
+    TEST_RUN(gl_basic, all_but_cgl_gles2_fwdcompat_bad_attribute);
 
-    TEST_RUN(gl_basic, linux_gles20);
+    TEST_RUN(gl_basic, all_but_cgl_gles20);
 
-    TEST_RUN(gl_basic, linux_gles3_rgb);
-    TEST_RUN(gl_basic, linux_gles3_rgba);
-    TEST_RUN(gl_basic, linux_gles3_fwdcompat_bad_attribute);
+    TEST_RUN(gl_basic, all_but_cgl_gles3_rgb);
+    TEST_RUN(gl_basic, all_but_cgl_gles3_rgba);
+    TEST_RUN(gl_basic, all_but_cgl_gles3_fwdcompat_bad_attribute);
 
-    TEST_RUN(gl_basic, linux_gles30);
+    TEST_RUN(gl_basic, all_but_cgl_gles30);
 }
 #endif // WAFFLE_HAS_X11_EGL
 
+#ifdef WAFFLE_HAS_WGL
+TEST(gl_basic, wgl_init)
+{
+    gl_basic_init(WAFFLE_PLATFORM_WGL);
+}
+
+static void
+testsuite_wgl(void)
+{
+    TEST_RUN(gl_basic, wgl_init);
+
+    TEST_RUN(gl_basic, all_gl_rgb);
+    TEST_RUN(gl_basic, all_gl_rgba);
+    TEST_RUN(gl_basic, all_but_cgl_gl_debug);
+    TEST_RUN(gl_basic, all_but_cgl_gl_fwdcompat_bad_attribute);
+
+    TEST_RUN(gl_basic, all_gl10);
+    TEST_RUN(gl_basic, all_gl11);
+    TEST_RUN(gl_basic, all_gl12);
+    TEST_RUN(gl_basic, all_gl13);
+    TEST_RUN(gl_basic, all_gl14);
+    TEST_RUN(gl_basic, all_gl15);
+    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, all_but_cgl_gl30);
+    TEST_RUN(gl_basic, all_but_cgl_gl30_fwdcompat);
+    TEST_RUN(gl_basic, all_but_cgl_gl31);
+    TEST_RUN(gl_basic, all_but_cgl_gl31_fwdcompat);
+
+    TEST_RUN(gl_basic, all_but_cgl_gl32_core);
+    TEST_RUN(gl_basic, all_but_cgl_gl32_core_fwdcompat);
+    TEST_RUN(gl_basic, all_but_cgl_gl33_core);
+    TEST_RUN(gl_basic, all_but_cgl_gl40_core);
+    TEST_RUN(gl_basic, all_but_cgl_gl41_core);
+    TEST_RUN(gl_basic, all_but_cgl_gl42_core);
+    TEST_RUN(gl_basic, all_but_cgl_gl43_core);
+
+    TEST_RUN(gl_basic, all_but_cgl_gl32_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl33_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl40_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl41_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl42_compat);
+    TEST_RUN(gl_basic, all_but_cgl_gl43_compat);
+
+    TEST_RUN(gl_basic, all_but_cgl_gles1_rgb);
+    TEST_RUN(gl_basic, all_but_cgl_gles1_rgba);
+    TEST_RUN(gl_basic, all_but_cgl_gles1_fwdcompat_bad_attribute);
+
+    TEST_RUN(gl_basic, all_but_cgl_gles10);
+    TEST_RUN(gl_basic, all_but_cgl_gles11);
+
+    TEST_RUN(gl_basic, all_but_cgl_gles2_rgb);
+    TEST_RUN(gl_basic, all_but_cgl_gles2_rgba);
+    TEST_RUN(gl_basic, all_but_cgl_gles2_fwdcompat_bad_attribute);
+
+    TEST_RUN(gl_basic, all_but_cgl_gles20);
+
+    TEST_RUN(gl_basic, all_but_cgl_gles3_rgb);
+    TEST_RUN(gl_basic, all_but_cgl_gles3_rgba);
+    TEST_RUN(gl_basic, all_but_cgl_gles3_fwdcompat_bad_attribute);
+
+    TEST_RUN(gl_basic, all_but_cgl_gles30);
+}
+#endif // WAFFLE_HAS_WGL
+
 static void
 usage_error(void)
 {
@@ -1095,6 +1162,9 @@ main(int argc, char *argv[])
 #ifdef WAFFLE_HAS_X11_EGL
     run_testsuite(testsuite_x11_egl);
 #endif
+#ifdef WAFFLE_HAS_WGL
+    run_testsuite(testsuite_wgl);
+#endif
 
    return 0;
 }
-- 
2.0.2



More information about the waffle mailing list