summaryrefslogtreecommitdiff
path: root/src/egl/wayland
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2011-02-04 15:37:51 -0500
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2011-02-07 14:01:31 +0100
commit56758c839ff29bd168529535a4816bff3b79cde5 (patch)
tree9ca01e899c867941fb3a2dbb64943bfdf70e7de6 /src/egl/wayland
parent93aea84f472f5f9ff588f7b2d4f7320ec43bc216 (diff)
wayland-egl: Force roundtrips to get device name and authenticate correctly
If the client hasn't done the initial wl_display_iterate() at the time we initialize the display, we have to do that in platform_wayland.c. Make sure we detect that correctly instead of dup()ing fd=0, and use the sync callback to make sure we don't wait forever for authorization that won't happen.
Diffstat (limited to 'src/egl/wayland')
-rw-r--r--src/egl/wayland/wayland-egl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/egl/wayland/wayland-egl.c b/src/egl/wayland/wayland-egl.c
index 6aa2d51063..bb95fcbf59 100644
--- a/src/egl/wayland/wayland-egl.c
+++ b/src/egl/wayland/wayland-egl.c
@@ -102,6 +102,7 @@ wl_egl_display_create(struct wl_display *display)
egl_display->display = display;
egl_display->drm = NULL;
+ egl_display->fd = -1;
egl_display->device_name = NULL;
egl_display->authenticated = false;