From 891a9c33c581ff9c66da792fbe61b4fbcdb50f7b Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Wed, 1 Jun 2011 13:42:35 +0100 Subject: [PATCH] Revert "quartz: Remove X11 ifdefs" This reverts commit eb81ec945c073bc87dc622d8b27906270953df8b. We are backing out the quartz specific stub winsys since we can simply use the generic stub winsys on quartz until we develop a standalone winsys. Since we plan on removing all special cases for the stub winsys by handling with a winsys vtable like all the others it's better if we don't introduce a quartz specific stub. --- cogl/winsys/cogl-winsys-quartz.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/cogl/winsys/cogl-winsys-quartz.c b/cogl/winsys/cogl-winsys-quartz.c index 30270e117..a45cbdf5b 100644 --- a/cogl/winsys/cogl-winsys-quartz.c +++ b/cogl/winsys/cogl-winsys-quartz.c @@ -74,6 +74,24 @@ _cogl_winsys_onscreen_remove_swap_buffers_callback (CoglOnscreen *onscreen, g_assert (0); } +#ifdef COGL_HAS_XLIB_SUPPORT +XVisualInfo * +_cogl_winsys_xlib_get_visual_info (void) +{ + g_assert (0); + return NULL; +} +#endif + +#ifdef COGL_HAS_X11_SUPPORT +guint32 +_cogl_winsys_onscreen_x11_get_window_xid (CoglOnscreen *onscreen) +{ + g_assert (0); + return 0; +} +#endif + gboolean _cogl_winsys_onscreen_init (CoglOnscreen *onscreen, GError **error)