diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2015-07-22 20:21:33 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2015-07-22 20:21:33 +0100 |
| commit | 8e9d3e92d8c56cd209a4fee6174013dd64782352 (patch) | |
| tree | 978c388d1904cf57eece6f81efeb4e699c99625b | |
| parent | e79d571453cdb63eeabe362403b1368d8b82483d (diff) | |
| download | cogl-8e9d3e92d8c56cd209a4fee6174013dd64782352.tar.gz | |
onscreen: Use the CoglRenderer API for retrieving the X visual
Instead of peeking into the winsys vtable.
| -rw-r--r-- | cogl/cogl-onscreen.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cogl/cogl-onscreen.c b/cogl/cogl-onscreen.c index 4768509b..e7af2a10 100644 --- a/cogl/cogl-onscreen.c +++ b/cogl/cogl-onscreen.c @@ -44,6 +44,10 @@ #include "cogl-poll-private.h" #include "cogl-gtype-private.h" +#ifdef COGL_HAS_X11_SUPPORT +#include "cogl-xlib-renderer.h" +#endif + static void _cogl_onscreen_free (CoglOnscreen *onscreen); COGL_OBJECT_DEFINE_WITH_CODE_GTYPE (Onscreen, onscreen, @@ -447,18 +451,17 @@ cogl_x11_onscreen_get_window_xid (CoglOnscreen *onscreen) uint32_t cogl_x11_onscreen_get_visual_xid (CoglOnscreen *onscreen) { - CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen); - const CoglWinsysVtable *winsys = _cogl_framebuffer_get_winsys (framebuffer); + CoglContext *ctx = COGL_FRAMEBUFFER (onscreen)->context; XVisualInfo *visinfo; uint32_t id; /* This should only be called for xlib based onscreens */ - _COGL_RETURN_VAL_IF_FAIL (winsys->xlib_get_visual_info != NULL, 0); + visinfo = cogl_xlib_renderer_get_visual_info (ctx->display->renderer); + if (visinfo == NULL) + return 0; - visinfo = winsys->xlib_get_visual_info (); id = (uint32_t)visinfo->visualid; - XFree (visinfo); return id; } #endif /* COGL_HAS_X11_SUPPORT */ |