summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorChad Versace <chad.versace@linux.intel.com>2012-10-27 13:45:24 -0700
committerChad Versace <chad.versace@linux.intel.com>2012-10-29 09:19:38 -0700
commitc2268a303f365b3f40e7e84edf3a0f10cdbecbf4 (patch)
treeadcb9587565d612e88dc32062d461cf24241f199 /tests
parent4d341d66fe89e87b9357813b60cd335c6f228486 (diff)
tests/gl_basic: Check that GLX does not support GLES1
Replace tests gl_basic.glx_gles1_rgb gl_basic.glx_gles1_rgba with gl_basic.glx_gles1_unsupported Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/functional/gl_basic_test.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/tests/functional/gl_basic_test.c b/tests/functional/gl_basic_test.c
index ab4f73c..fbb174a 100644
--- a/tests/functional/gl_basic_test.c
+++ b/tests/functional/gl_basic_test.c
@@ -294,16 +294,16 @@ TEST(gl_basic, glx_init)
gl_basic_init(WAFFLE_PLATFORM_GLX);
}
-TEST(gl_basic, glx_gl_rgb)
+TEST(gl_basic, glx_gles1_unsupported)
{
- gl_basic_draw(WAFFLE_CONTEXT_OPENGL,
+ gl_basic_draw(WAFFLE_CONTEXT_OPENGL_ES1,
0 /*alpha*/,
- false /*expect_config_unsupported*/);
+ true /*expect_config_unsupported*/);
}
-TEST(gl_basic, glx_gles1_rgb)
+TEST(gl_basic, glx_gl_rgb)
{
- gl_basic_draw(WAFFLE_CONTEXT_OPENGL_ES1,
+ gl_basic_draw(WAFFLE_CONTEXT_OPENGL,
0 /*alpha*/,
false /*expect_config_unsupported*/);
}
@@ -322,13 +322,6 @@ TEST(gl_basic, glx_gl_rgba)
false /*expect_config_unsupported*/);
}
-TEST(gl_basic, glx_gles1_rgba)
-{
- gl_basic_draw(WAFFLE_CONTEXT_OPENGL_ES1,
- 1 /*alpha*/,
- false /*expect_config_unsupported*/);
-}
-
TEST(gl_basic, glx_gles2_rgba)
{
gl_basic_draw(WAFFLE_CONTEXT_OPENGL_ES2,
@@ -340,11 +333,12 @@ static void
testsuite_glx(void)
{
TEST_RUN(gl_basic, glx_init);
+
+ TEST_RUN(gl_basic, glx_gles1_unsupported);
+
TEST_RUN(gl_basic, glx_gl_rgb);
- TEST_RUN(gl_basic, glx_gles1_rgb);
TEST_RUN(gl_basic, glx_gles2_rgb);
TEST_RUN(gl_basic, glx_gl_rgba);
- TEST_RUN(gl_basic, glx_gles1_rgba);
TEST_RUN(gl_basic, glx_gles2_rgba);
}
#endif // WAFFLE_HAS_GLX