[waffle] [PATCH 2/8] test/gl_basic_test: use all_gl_(10-21) tests for all platforms
Emil Velikov
emil.l.velikov at gmail.com
Mon Aug 4 07:34:17 PDT 2014
Neither of these tests is platform specific, so as such lets avoid the
duplication and move them to a single location.
Strictly speaking we're adding the gl21_fwdcompat_bad_attribute test for
cgl, which is handled by core waffle and returns error_bad_attribute.
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
tests/functional/gl_basic_test.c | 314 ++++++++++-----------------------------
1 file changed, 78 insertions(+), 236 deletions(-)
diff --git a/tests/functional/gl_basic_test.c b/tests/functional/gl_basic_test.c
index 117df00..95799d2 100644
--- a/tests/functional/gl_basic_test.c
+++ b/tests/functional/gl_basic_test.c
@@ -367,84 +367,93 @@ TEST(gl_basic, all_gl_rgba)
.alpha=true);
}
-#ifdef WAFFLE_HAS_CGL
-TEST(gl_basic, cgl_init)
+TEST(gl_basic, all_gl10)
{
- gl_basic_init(WAFFLE_PLATFORM_CGL);
+ gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+ .version=10);
}
-TEST(gl_basic, cgl_gles1_unsupported)
+TEST(gl_basic, all_gl11)
{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES1,
- .expect_error=WAFFLE_ERROR_UNSUPPORTED_ON_PLATFORM);
+ gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+ .version=11);
}
-TEST(gl_basic, cgl_gles2_unsupported)
+TEST(gl_basic, all_gl12)
{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES2,
- .expect_error=WAFFLE_ERROR_UNSUPPORTED_ON_PLATFORM);
+ gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
+ .version=12);
}
-TEST(gl_basic, cgl_gl_debug_is_unsupported)
+TEST(gl_basic, all_gl13)
{
gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .debug=true,
- .expect_error=WAFFLE_ERROR_UNSUPPORTED_ON_PLATFORM);
+ .version=13);
}
-TEST(gl_basic, cgl_gl_fwdcompat_bad_attribute)
+TEST(gl_basic, all_gl14)
{
gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .forward_compatible=true,
- .expect_error=WAFFLE_ERROR_BAD_ATTRIBUTE);
+ .version=14);
}
-TEST(gl_basic, cgl_gl10)
+TEST(gl_basic, all_gl15)
{
gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=10);
+ .version=15);
}
-TEST(gl_basic, cgl_gl11)
+TEST(gl_basic, all_gl20)
{
gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=11);
+ .version=20);
}
-TEST(gl_basic, cgl_gl12)
+TEST(gl_basic, all_gl21)
{
gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=12);
+ .version=21);
}
-TEST(gl_basic, cgl_gl13)
+TEST(gl_basic, all_gl21_fwdcompat_bad_attribute)
{
gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=13);
+ .version=21,
+ .forward_compatible=true,
+ .expect_error=WAFFLE_ERROR_BAD_ATTRIBUTE);
}
-TEST(gl_basic, cgl_gl14)
+
+#ifdef WAFFLE_HAS_CGL
+TEST(gl_basic, cgl_init)
{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=14);
+ gl_basic_init(WAFFLE_PLATFORM_CGL);
}
-TEST(gl_basic, cgl_gl15)
+TEST(gl_basic, cgl_gles1_unsupported)
{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=15);
+ gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES1,
+ .expect_error=WAFFLE_ERROR_UNSUPPORTED_ON_PLATFORM);
+}
+
+TEST(gl_basic, cgl_gles2_unsupported)
+{
+ gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL_ES2,
+ .expect_error=WAFFLE_ERROR_UNSUPPORTED_ON_PLATFORM);
}
-TEST(gl_basic, cgl_gl20)
+TEST(gl_basic, cgl_gl_debug_is_unsupported)
{
gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=20);
+ .debug=true,
+ .expect_error=WAFFLE_ERROR_UNSUPPORTED_ON_PLATFORM);
}
-TEST(gl_basic, cgl_gl21)
+TEST(gl_basic, cgl_gl_fwdcompat_bad_attribute)
{
gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=21);
+ .forward_compatible=true,
+ .expect_error=WAFFLE_ERROR_BAD_ATTRIBUTE);
}
TEST(gl_basic, cgl_gl30)
@@ -569,14 +578,15 @@ testsuite_cgl(void)
TEST_RUN(gl_basic, cgl_gl_debug_is_unsupported);
TEST_RUN(gl_basic, cgl_gl_fwdcompat_bad_attribute);
- TEST_RUN(gl_basic, cgl_gl10);
- TEST_RUN(gl_basic, cgl_gl11);
- TEST_RUN(gl_basic, cgl_gl12);
- TEST_RUN(gl_basic, cgl_gl13);
- TEST_RUN(gl_basic, cgl_gl14);
- TEST_RUN(gl_basic, cgl_gl15);
- TEST_RUN(gl_basic, cgl_gl20);
- TEST_RUN(gl_basic, cgl_gl21);
+ 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, cgl_gl30);
TEST_RUN(gl_basic, cgl_gl31);
@@ -615,62 +625,6 @@ TEST(gl_basic, glx_gl_fwdcompat_bad_attribute)
.expect_error=WAFFLE_ERROR_BAD_ATTRIBUTE);
}
-TEST(gl_basic, glx_gl10)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=10);
-}
-
-TEST(gl_basic, glx_gl11)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=11);
-}
-
-TEST(gl_basic, glx_gl12)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=12);
-}
-
-TEST(gl_basic, glx_gl13)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=13);
-}
-
-TEST(gl_basic, glx_gl14)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=14);
-}
-
-TEST(gl_basic, glx_gl15)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=15);
-}
-
-TEST(gl_basic, glx_gl20)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=20);
-}
-
-TEST(gl_basic, glx_gl21)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=21);
-}
-
-TEST(gl_basic, glx_gl21_fwdcompat_bad_attribute)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=21,
- .forward_compatible=true,
- .expect_error=WAFFLE_ERROR_BAD_ATTRIBUTE);
-}
-
TEST(gl_basic, glx_gl30)
{
gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
@@ -879,15 +833,15 @@ testsuite_glx(void)
TEST_RUN(gl_basic, glx_gl_debug);
TEST_RUN(gl_basic, glx_gl_fwdcompat_bad_attribute);
- TEST_RUN(gl_basic, glx_gl10);
- TEST_RUN(gl_basic, glx_gl11);
- TEST_RUN(gl_basic, glx_gl12);
- TEST_RUN(gl_basic, glx_gl13);
- TEST_RUN(gl_basic, glx_gl14);
- TEST_RUN(gl_basic, glx_gl15);
- TEST_RUN(gl_basic, glx_gl20);
- TEST_RUN(gl_basic, glx_gl21);
- TEST_RUN(gl_basic, glx_gl21_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, glx_gl30);
TEST_RUN(gl_basic, glx_gl30_fwdcompat);
TEST_RUN(gl_basic, glx_gl31);
@@ -948,62 +902,6 @@ TEST(gl_basic, wayland_gl_fwdcompat_bad_attribute)
.expect_error=WAFFLE_ERROR_BAD_ATTRIBUTE);
}
-TEST(gl_basic, wayland_gl10)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=10);
-}
-
-TEST(gl_basic, wayland_gl11)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=11);
-}
-
-TEST(gl_basic, wayland_gl12)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=12);
-}
-
-TEST(gl_basic, wayland_gl13)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=13);
-}
-
-TEST(gl_basic, wayland_gl14)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=14);
-}
-
-TEST(gl_basic, wayland_gl15)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=15);
-}
-
-TEST(gl_basic, wayland_gl20)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=20);
-}
-
-TEST(gl_basic, wayland_gl21)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=21);
-}
-
-TEST(gl_basic, wayland_gl21_fwdcompat_bad_attribute)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=21,
- .forward_compatible=true,
- .expect_error=WAFFLE_ERROR_BAD_ATTRIBUTE);
-}
-
TEST(gl_basic, wayland_gl30)
{
gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
@@ -1213,15 +1111,15 @@ testsuite_wayland(void)
TEST_RUN(gl_basic, wayland_gl_debug);
TEST_RUN(gl_basic, wayland_gl_fwdcompat_bad_attribute);
- TEST_RUN(gl_basic, wayland_gl10);
- TEST_RUN(gl_basic, wayland_gl11);
- TEST_RUN(gl_basic, wayland_gl12);
- TEST_RUN(gl_basic, wayland_gl13);
- TEST_RUN(gl_basic, wayland_gl14);
- TEST_RUN(gl_basic, wayland_gl15);
- TEST_RUN(gl_basic, wayland_gl20);
- TEST_RUN(gl_basic, wayland_gl21);
- TEST_RUN(gl_basic, wayland_gl21_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, wayland_gl30);
TEST_RUN(gl_basic, wayland_gl30_fwdcompat);
TEST_RUN(gl_basic, wayland_gl31);
@@ -1282,62 +1180,6 @@ TEST(gl_basic, x11_egl_gl_fwdcompat_bad_attribute)
.expect_error=WAFFLE_ERROR_BAD_ATTRIBUTE);
}
-TEST(gl_basic, x11_egl_gl10)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=10);
-}
-
-TEST(gl_basic, x11_egl_gl11)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=11);
-}
-
-TEST(gl_basic, x11_egl_gl12)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=12);
-}
-
-TEST(gl_basic, x11_egl_gl13)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=13);
-}
-
-TEST(gl_basic, x11_egl_gl14)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=14);
-}
-
-TEST(gl_basic, x11_egl_gl15)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=15);
-}
-
-TEST(gl_basic, x11_egl_gl20)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=20);
-}
-
-TEST(gl_basic, x11_egl_gl21)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=21);
-}
-
-TEST(gl_basic, x11_egl_gl21_fwdcompat_bad_attribute)
-{
- gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
- .version=21,
- .forward_compatible=true,
- .expect_error=WAFFLE_ERROR_BAD_ATTRIBUTE);
-}
-
TEST(gl_basic, x11_egl_gl30)
{
gl_basic_draw(.api=WAFFLE_CONTEXT_OPENGL,
@@ -1546,15 +1388,15 @@ testsuite_x11_egl(void)
TEST_RUN(gl_basic, x11_egl_gl_debug);
TEST_RUN(gl_basic, x11_egl_gl_fwdcompat_bad_attribute);
- TEST_RUN(gl_basic, x11_egl_gl10);
- TEST_RUN(gl_basic, x11_egl_gl11);
- TEST_RUN(gl_basic, x11_egl_gl12);
- TEST_RUN(gl_basic, x11_egl_gl13);
- TEST_RUN(gl_basic, x11_egl_gl14);
- TEST_RUN(gl_basic, x11_egl_gl15);
- TEST_RUN(gl_basic, x11_egl_gl20);
- TEST_RUN(gl_basic, x11_egl_gl21);
- TEST_RUN(gl_basic, x11_egl_gl21_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, x11_egl_gl30);
TEST_RUN(gl_basic, x11_egl_gl30_fwdcompat);
TEST_RUN(gl_basic, x11_egl_gl31);
--
2.0.2
More information about the waffle
mailing list