isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 12:32:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

x11/backend: Use an internal GError

Browse Source 
Don't just return the error from Cogl, but proxy it so that it has the
correct error domain and code.
This commit is contained in:
Emmanuele Bassi 2011-11-03 14:02:43 +00:00
parent 7a2001436b
commit 983510fad4
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
clutter/x11/clutter-backend-x11.c
View File

@ -687,6 +687,7 @@ clutter_backend_x11_create_context (ClutterBackend *backend,
ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (backend); ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (backend);
CoglOnscreenTemplate *onscreen_template = NULL; CoglOnscreenTemplate *onscreen_template = NULL;
CoglSwapChain *swap_chain = NULL; CoglSwapChain *swap_chain = NULL;
GError *internal_error = NULL;
gboolean status; gboolean status;
if (backend->cogl_context != NULL) if (backend->cogl_context != NULL)
@ -695,26 +696,31 @@ clutter_backend_x11_create_context (ClutterBackend *backend,
backend->cogl_renderer = cogl_renderer_new (); backend->cogl_renderer = cogl_renderer_new ();
cogl_xlib_renderer_set_foreign_display (backend->cogl_renderer, cogl_xlib_renderer_set_foreign_display (backend->cogl_renderer,
backend_x11->xdpy); backend_x11->xdpy);
if (!cogl_renderer_connect (backend->cogl_renderer, error)) if (!cogl_renderer_connect (backend->cogl_renderer, &internal_error))
goto error; goto error;
swap_chain = cogl_swap_chain_new (); swap_chain = cogl_swap_chain_new ();
cogl_swap_chain_set_has_alpha (swap_chain, cogl_swap_chain_set_has_alpha (swap_chain, clutter_enable_argb);
clutter_x11_get_use_argb_visual ());
onscreen_template = cogl_onscreen_template_new (swap_chain); onscreen_template = cogl_onscreen_template_new (swap_chain);
cogl_object_unref (swap_chain); cogl_object_unref (swap_chain);
/* XXX: I have some doubts that this is a good design. /* XXX: I have some doubts that this is a good design.
*
* Conceptually should we be able to check an onscreen_template * Conceptually should we be able to check an onscreen_template
* without more details about the CoglDisplay configuration? * without more details about the CoglDisplay configuration?
*/ */
status = cogl_renderer_check_onscreen_template (backend->cogl_renderer, status = cogl_renderer_check_onscreen_template (backend->cogl_renderer,
onscreen_template, onscreen_template,
error); &internal_error);
if (!status && clutter_x11_get_use_argb_visual ()) if (!status && clutter_enable_argb)
{ {
g_clear_error (error); CLUTTER_NOTE (BACKEND,
"Creation of a context with a ARGB visual failed: %s",
internal_error != NULL ? internal_error->message
: "Unknown reason");
g_clear_error (&internal_error);
/* It's possible that the current renderer doesn't support transparency /* It's possible that the current renderer doesn't support transparency
* in a swap_chain so lets see if we can fallback to not having any * in a swap_chain so lets see if we can fallback to not having any
@ -723,10 +729,11 @@ clutter_backend_x11_create_context (ClutterBackend *backend,
* XXX: It might be nice to have a CoglRenderer feature we could * XXX: It might be nice to have a CoglRenderer feature we could
* explicitly check for ahead of time. * explicitly check for ahead of time.
*/ */
clutter_enable_argb = FALSE;
cogl_swap_chain_set_has_alpha (swap_chain, FALSE); cogl_swap_chain_set_has_alpha (swap_chain, FALSE);
status = cogl_renderer_check_onscreen_template (backend->cogl_renderer, status = cogl_renderer_check_onscreen_template (backend->cogl_renderer,
onscreen_template, onscreen_template,
error); &internal_error);
} }
if (!status) if (!status)
@ -738,16 +745,28 @@ clutter_backend_x11_create_context (ClutterBackend *backend,
cogl_object_unref (backend->cogl_renderer); cogl_object_unref (backend->cogl_renderer);
cogl_object_unref (onscreen_template); cogl_object_unref (onscreen_template);
if (!cogl_display_setup (backend->cogl_display, error)) if (!cogl_display_setup (backend->cogl_display, &internal_error))
goto error; goto error;
backend->cogl_context = cogl_context_new (backend->cogl_display, error); backend->cogl_context = cogl_context_new (backend->cogl_display,
&internal_error);
if (backend->cogl_context == NULL) if (backend->cogl_context == NULL)
goto error; goto error;
return TRUE; return TRUE;
error: error:
if (internal_error != NULL)
{
CLUTTER_NOTE (BACKEND, "Backend creation failed: %s",
internal_error->message);
g_set_error_literal (error, CLUTTER_INIT_ERROR,
CLUTTER_INIT_ERROR_BACKEND,
internal_error->message);
g_error_free (internal_error);
}
if (backend->cogl_display != NULL) if (backend->cogl_display != NULL)
{ {
cogl_object_unref (backend->cogl_display); cogl_object_unref (backend->cogl_display);