sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

ui: Disable gdk's gl support

Browse source 
This fixes a deadlock on wayland.
This commit is contained in:
Adel Gadllah 2015-01-08 11:14:38 +01:00
parent 20bee6f48e
commit fea7ac84ee
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ui/ui.c
View file

@ -48,11 +48,20 @@ struct _MetaUI
void void
meta_ui_init (void) meta_ui_init (void)
{ {
const char *gdk_gl_env = NULL;
gdk_set_allowed_backends ("x11"); gdk_set_allowed_backends ("x11");
gdk_gl_env = g_getenv ("GDK_GL");
g_setenv("GDK_GL", "disable", TRUE);
if (!gtk_init_check (NULL, NULL)) if (!gtk_init_check (NULL, NULL))
meta_fatal ("Unable to open X display %s\n", XDisplayName (NULL)); meta_fatal ("Unable to open X display %s\n", XDisplayName (NULL));
if (gdk_gl_env)
g_setenv("GDK_GL", gdk_gl_env, TRUE);
else
unsetenv("GDK_GL");
/* We need to be able to fully trust that the window and monitor sizes /* We need to be able to fully trust that the window and monitor sizes
that Gdk reports corresponds to the X ones, so we disable the automatic that Gdk reports corresponds to the X ones, so we disable the automatic
scale handling */ scale handling */