isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 01:50:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

launcher: Unconditionally set the FD

Browse Source 
We only open weston-launch if we're in the native backend,
so we don't need to check here.
This commit is contained in:
Jasper St. Pierre 2014-04-22 17:15:31 -04:00
parent 3c3b94921f
commit 59415bf49f
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/backends/native/meta-launcher.c
View File

@ -340,7 +340,9 @@ MetaLauncher *
meta_launcher_new (void) meta_launcher_new (void)
{ {
MetaLauncher *self = g_slice_new0 (MetaLauncher); MetaLauncher *self = g_slice_new0 (MetaLauncher);
GError *error = NULL;
int launch_fd; int launch_fd;
int kms_fd;
launch_fd = env_get_fd ("WESTON_LAUNCHER_SOCK"); launch_fd = env_get_fd ("WESTON_LAUNCHER_SOCK");
if (launch_fd < 0) if (launch_fd < 0)
@ -361,22 +363,15 @@ meta_launcher_new (void)
g_source_attach (self->inner_source, self->nested_context); g_source_attach (self->inner_source, self->nested_context);
g_source_unref (self->inner_source); g_source_unref (self->inner_source);
kms_fd = meta_launcher_open_device (self, "/dev/dri/card0", O_RDWR, &error);
if (error)
g_error ("Failed to open /dev/dri/card0: %s", error->message);
clutter_egl_set_kms_fd (kms_fd);
clutter_evdev_set_device_callbacks (on_evdev_device_open, clutter_evdev_set_device_callbacks (on_evdev_device_open,
on_evdev_device_close, on_evdev_device_close,
self); self);
#if defined(CLUTTER_WINDOWING_EGL)
if (clutter_check_windowing_backend (CLUTTER_WINDOWING_EGL))
{
GError *error = NULL;
int fd = meta_launcher_open_device (self, "/dev/dri/card0", O_RDWR, &error);
if (error)
g_error ("Failed to open /dev/dri/card0: %s", error->message);
clutter_egl_set_kms_fd (fd);
}
#endif
return self; return self;
} }