brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter/backend: Propagate error when initializing context

Browse Source 
Any caught error message was silently dropped.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1994>
This commit is contained in:
Jonas Ådahl 2021-09-07 17:23:08 +02:00 committed by Marge Bot
parent b6857e59b2
commit b10b77cc46
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clutter/clutter/clutter-backend.c
View File

@ -189,22 +189,20 @@ clutter_backend_do_real_create_context (ClutterBackend *backend,
{ {
ClutterBackendClass *klass; ClutterBackendClass *klass;
CoglSwapChain *swap_chain; CoglSwapChain *swap_chain;
GError *internal_error;
klass = CLUTTER_BACKEND_GET_CLASS (backend); klass = CLUTTER_BACKEND_GET_CLASS (backend);
swap_chain = NULL; swap_chain = NULL;
internal_error = NULL;
CLUTTER_NOTE (BACKEND, "Creating Cogl renderer"); CLUTTER_NOTE (BACKEND, "Creating Cogl renderer");
backend->cogl_renderer = klass->get_renderer (backend, &internal_error); backend->cogl_renderer = klass->get_renderer (backend, error);
if (backend->cogl_renderer == NULL) if (backend->cogl_renderer == NULL)
goto error; goto error;
CLUTTER_NOTE (BACKEND, "Connecting the renderer"); CLUTTER_NOTE (BACKEND, "Connecting the renderer");
cogl_renderer_set_driver (backend->cogl_renderer, driver_id); cogl_renderer_set_driver (backend->cogl_renderer, driver_id);
if (!cogl_renderer_connect (backend->cogl_renderer, &internal_error)) if (!cogl_renderer_connect (backend->cogl_renderer, error))
goto error; goto error;
CLUTTER_NOTE (BACKEND, "Creating Cogl swap chain"); CLUTTER_NOTE (BACKEND, "Creating Cogl swap chain");
@ -216,7 +214,7 @@ clutter_backend_do_real_create_context (ClutterBackend *backend,
backend->cogl_display = klass->get_display (backend, backend->cogl_display = klass->get_display (backend,
backend->cogl_renderer, backend->cogl_renderer,
swap_chain, swap_chain,
&internal_error); error);
} }
else else
{ {
@ -232,7 +230,7 @@ clutter_backend_do_real_create_context (ClutterBackend *backend,
*/ */
res = cogl_renderer_check_onscreen_template (backend->cogl_renderer, res = cogl_renderer_check_onscreen_template (backend->cogl_renderer,
tmpl, tmpl,
&internal_error); error);
if (!res) if (!res)
goto error; goto error;
@ -247,11 +245,11 @@ clutter_backend_do_real_create_context (ClutterBackend *backend,
goto error; goto error;
CLUTTER_NOTE (BACKEND, "Setting up the display"); CLUTTER_NOTE (BACKEND, "Setting up the display");
if (!cogl_display_setup (backend->cogl_display, &internal_error)) if (!cogl_display_setup (backend->cogl_display, error))
goto error; goto error;
CLUTTER_NOTE (BACKEND, "Creating the Cogl context"); CLUTTER_NOTE (BACKEND, "Creating the Cogl context");
backend->cogl_context = cogl_context_new (backend->cogl_display, &internal_error); backend->cogl_context = cogl_context_new (backend->cogl_display, error);
if (backend->cogl_context == NULL) if (backend->cogl_context == NULL)
goto error; goto error;