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

mir: correctly init/clear mutex and use prgname for surface

Browse Source
This commit is contained in:
Marco Trevisan (Treviño) 2014-12-09 20:16:36 +01:00
parent 1016fb64de
commit a9a923c6f3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -532,7 +532,7 @@ _cogl_winsys_egl_onscreen_init (CoglOnscreen *onscreen,
} }
else else
{ {
surfaceparm.name = "CoglSurface"; surfaceparm.name = g_get_prgname ();
surfaceparm.width = cogl_framebuffer_get_width (framebuffer); surfaceparm.width = cogl_framebuffer_get_width (framebuffer);
surfaceparm.height = cogl_framebuffer_get_height (framebuffer); surfaceparm.height = cogl_framebuffer_get_height (framebuffer);
surfaceparm.pixel_format = _mir_connection_get_valid_format (mir_renderer->mir_connection); surfaceparm.pixel_format = _mir_connection_get_valid_format (mir_renderer->mir_connection);
@ -577,6 +577,7 @@ _cogl_winsys_egl_onscreen_init (CoglOnscreen *onscreen,
event_handler.callback = _mir_surface_event_cb; event_handler.callback = _mir_surface_event_cb;
event_handler.context = onscreen; event_handler.context = onscreen;
mir_surface_set_event_handler (mir_onscreen->mir_surface, &event_handler); mir_surface_set_event_handler (mir_onscreen->mir_surface, &event_handler);
g_mutex_init (&mir_onscreen->mir_event_lock);
} }
return TRUE; return TRUE;
@ -592,6 +593,7 @@ _cogl_winsys_egl_onscreen_deinit (CoglOnscreen *onscreen)
{ {
mir_surface_set_event_handler (mir_onscreen->mir_surface, NULL); mir_surface_set_event_handler (mir_onscreen->mir_surface, NULL);
mir_surface_release_sync (mir_onscreen->mir_surface); mir_surface_release_sync (mir_onscreen->mir_surface);
g_mutex_clear (&mir_onscreen->mir_event_lock);
mir_onscreen->mir_surface = NULL; mir_onscreen->mir_surface = NULL;
} }