diff options
Diffstat (limited to 'cogl/winsys/cogl-winsys-egl-x11.c')
| -rw-r--r-- | cogl/winsys/cogl-winsys-egl-x11.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/cogl/winsys/cogl-winsys-egl-x11.c b/cogl/winsys/cogl-winsys-egl-x11.c index 1b02ac09..fca7609f 100644 --- a/cogl/winsys/cogl-winsys-egl-x11.c +++ b/cogl/winsys/cogl-winsys-egl-x11.c @@ -42,6 +42,7 @@ #include "cogl-texture-pixmap-x11-private.h" #include "cogl-texture-2d-private.h" +#include "cogl-error-private.h" #define COGL_ONSCREEN_X11_EVENT_MASK StructureNotifyMask @@ -194,7 +195,7 @@ _cogl_winsys_renderer_disconnect (CoglRenderer *renderer) static CoglBool _cogl_winsys_renderer_connect (CoglRenderer *renderer, - GError **error) + CoglError **error) { CoglRendererEGL *egl_renderer; CoglXlibRenderer *xlib_renderer; @@ -223,7 +224,7 @@ error: static CoglBool _cogl_winsys_egl_display_setup (CoglDisplay *display, - GError **error) + CoglError **error) { CoglDisplayEGL *egl_display = display->winsys; CoglDisplayXlib *xlib_display; @@ -244,7 +245,7 @@ _cogl_winsys_egl_display_destroy (CoglDisplay *display) static CoglBool _cogl_winsys_egl_context_init (CoglContext *context, - GError **error) + CoglError **error) { cogl_xlib_renderer_add_filter (context->display->renderer, event_filter_cb, @@ -271,7 +272,7 @@ _cogl_winsys_egl_context_deinit (CoglContext *context) static CoglBool _cogl_winsys_egl_onscreen_init (CoglOnscreen *onscreen, EGLConfig egl_config, - GError **error) + CoglError **error) { CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen); CoglContext *context = framebuffer->context; @@ -312,7 +313,7 @@ _cogl_winsys_egl_onscreen_init (CoglOnscreen *onscreen, char message[1000]; XGetErrorText (xlib_renderer->xdpy, xerror, message, sizeof (message)); - g_set_error (error, COGL_WINSYS_ERROR, + _cogl_set_error (error, COGL_WINSYS_ERROR, COGL_WINSYS_ERROR_CREATE_ONSCREEN, "Unable to query geometry of foreign " "xid 0x%08lX: %s", @@ -347,7 +348,7 @@ _cogl_winsys_egl_onscreen_init (CoglOnscreen *onscreen, xvisinfo = get_visual_info (display, egl_config); if (xvisinfo == NULL) { - g_set_error (error, COGL_WINSYS_ERROR, + _cogl_set_error (error, COGL_WINSYS_ERROR, COGL_WINSYS_ERROR_CREATE_ONSCREEN, "Unable to retrieve the X11 visual of context's " "fbconfig"); @@ -389,7 +390,7 @@ _cogl_winsys_egl_onscreen_init (CoglOnscreen *onscreen, char message[1000]; XGetErrorText (xlib_renderer->xdpy, xerror, message, sizeof (message)); - g_set_error (error, COGL_WINSYS_ERROR, + _cogl_set_error (error, COGL_WINSYS_ERROR, COGL_WINSYS_ERROR_CREATE_ONSCREEN, "X error while creating Window for CoglOnscreen: %s", message); @@ -510,7 +511,7 @@ _cogl_winsys_onscreen_x11_get_window_xid (CoglOnscreen *onscreen) static CoglBool _cogl_winsys_egl_context_created (CoglDisplay *display, - GError **error) + CoglError **error) { CoglRenderer *renderer = display->renderer; CoglDisplayEGL *egl_display = display->winsys; @@ -575,7 +576,7 @@ _cogl_winsys_egl_context_created (CoglDisplay *display, return TRUE; fail: - g_set_error (error, COGL_WINSYS_ERROR, + _cogl_set_error (error, COGL_WINSYS_ERROR, COGL_WINSYS_ERROR_CREATE_CONTEXT, "%s", error_message); return FALSE; |