isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 03:20:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

mir: improve error logging

Browse Source
This commit is contained in:
Marco Trevisan (Treviño) 2014-11-18 22:11:24 +01:00
parent e5fd82e2a1
commit b26466ad54
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cogl/winsys/cogl-winsys-egl-mir.c
View File

@ -250,7 +250,8 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer,
{ {
_cogl_set_error (error, COGL_WINSYS_ERROR, _cogl_set_error (error, COGL_WINSYS_ERROR,
COGL_WINSYS_ERROR_INIT, COGL_WINSYS_ERROR_INIT,
"Failed to connect mir display"); "Failed to connect mir display: %s",
mir_connection_get_error_message (mir_renderer->mir_connection));
goto error; goto error;
} }
} }
@ -314,6 +315,7 @@ make_dummy_surface (CoglDisplay *display,
MirEGLNativeWindowType dummy_mir_egl_native_window; MirEGLNativeWindowType dummy_mir_egl_native_window;
MirSurfaceParameters surfaceparm; MirSurfaceParameters surfaceparm;
const char *error_message; const char *error_message;
const char *error_detail = "";
surfaceparm.name = "CoglDummySurface"; surfaceparm.name = "CoglDummySurface";
surfaceparm.width = 1; surfaceparm.width = 1;
@ -324,9 +326,10 @@ make_dummy_surface (CoglDisplay *display,
mir_display->dummy_mir_surface = mir_display->dummy_mir_surface =
mir_connection_create_surface_sync (mir_renderer->mir_connection, &surfaceparm); mir_connection_create_surface_sync (mir_renderer->mir_connection, &surfaceparm);
if (!mir_display->dummy_mir_surface) if (!mir_surface_is_valid (mir_display->dummy_mir_surface))
{ {
error_message = "Failed to create a dummy mir surface"; error_message = "Failed to create a dummy mir surface";
error_detail = mir_surface_get_error_message (mir_display->dummy_mir_surface);
goto fail; goto fail;
} }
@ -335,6 +338,7 @@ make_dummy_surface (CoglDisplay *display,
if (!dummy_mir_egl_native_window) if (!dummy_mir_egl_native_window)
{ {
error_message = "Failed to get a dummy mir native egl surface"; error_message = "Failed to get a dummy mir native egl surface";
error_detail = mir_surface_get_error_message (mir_display->dummy_mir_surface);
goto fail; goto fail;
} }
@ -354,7 +358,9 @@ make_dummy_surface (CoglDisplay *display,
fail: fail:
_cogl_set_error (error, COGL_WINSYS_ERROR, _cogl_set_error (error, COGL_WINSYS_ERROR,
COGL_WINSYS_ERROR_CREATE_CONTEXT, COGL_WINSYS_ERROR_CREATE_CONTEXT,
"%s", error_message); "%s%s%s", error_message,
error_detail != '\0' ? ": " : "",
error_detail);
return FALSE; return FALSE;
} }
@ -538,7 +544,8 @@ _cogl_winsys_egl_onscreen_init (CoglOnscreen *onscreen,
{ {
_cogl_set_error (error, COGL_WINSYS_ERROR, _cogl_set_error (error, COGL_WINSYS_ERROR,
COGL_WINSYS_ERROR_CREATE_ONSCREEN, COGL_WINSYS_ERROR_CREATE_ONSCREEN,
"Error while creating mir surface for CoglOnscreen"); "Error while creating mir surface for CoglOnscreen: %s",
mir_surface_get_error_message (mir_onscreen->mir_surface));
return FALSE; return FALSE;
} }
@ -548,7 +555,8 @@ _cogl_winsys_egl_onscreen_init (CoglOnscreen *onscreen,
_cogl_set_error (error, COGL_WINSYS_ERROR, _cogl_set_error (error, COGL_WINSYS_ERROR,
COGL_WINSYS_ERROR_CREATE_ONSCREEN, COGL_WINSYS_ERROR_CREATE_ONSCREEN,
"Error while getting mir egl native window " "Error while getting mir egl native window "
"for CoglOnscreen"); "for CoglOnscreen: %s",
mir_surface_get_error_message (mir_onscreen->mir_surface));
return FALSE; return FALSE;
} }