[cogl/wip/rig: 31/33] test-utils: support testing with sdl
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/wip/rig: 31/33] test-utils: support testing with sdl
- Date: Mon, 23 Feb 2015 21:36:54 +0000 (UTC)
commit aa2655eb3d216a2391a522900bd6138add86a518
Author: Robert Bragg <robert sixbynine org>
Date: Thu Jun 12 00:16:19 2014 +0100
test-utils: support testing with sdl
test-fixtures/test-utils.c | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
---
diff --git a/test-fixtures/test-utils.c b/test-fixtures/test-utils.c
index fff5b15..0aa1b34 100644
--- a/test-fixtures/test-utils.c
+++ b/test-fixtures/test-utils.c
@@ -2,6 +2,13 @@
#include <stdlib.h>
+#include <cogl/cogl-defines.h>
+
+#ifdef COGL_HAS_SDL_SUPPORT
+#include <cogl/cogl-sdl.h>
+#include <SDL.h>
+#endif
+
#include "test-unit.h"
#include "test-utils.h"
@@ -158,12 +165,22 @@ test_utils_init (TestFlags requirement_flags,
g_setenv ("COGL_X11_SYNC", "1", 0);
- test_ctx = cogl_context_new (NULL, &error);
- if (!test_ctx)
- g_critical ("Failed to create a CoglContext: %s", error->message);
+ renderer = cogl_renderer_new ();
+
+#ifdef COGL_HAS_SDL_SUPPORT
+ cogl_sdl_renderer_set_event_type (renderer, SDL_USEREVENT);
+#endif
- display = cogl_context_get_display (test_ctx);
- renderer = cogl_display_get_renderer (display);
+ if (!cogl_renderer_connect (renderer, &error))
+ c_error ("Failed to create a CoglRenderer: %s", error->message);
+
+ display = cogl_display_new (renderer, NULL);
+ if (!cogl_display_setup (display, &error))
+ c_error ("Failed to setup a CoglDisplay: %s", error->message);
+
+ test_ctx = cogl_context_new (display, &error);
+ if (!test_ctx)
+ c_error ("Failed to create a CoglContext: %s", error->message);
missing_requirement = !check_flags (requirement_flags, renderer);
known_failure = !check_flags (known_failure_flags, renderer);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]