diff options
| author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2011-08-09 14:33:45 +0200 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-08-31 16:25:18 -0400 |
| commit | 91eacca38bafbb7fccb8ba60ac8058dc4bda7406 (patch) | |
| tree | 773c85ac31fa6651c65d76ad3ecc99f104921b36 | |
| parent | 48c4ea2dbdc6e06c54c96764d6fc91871f65d909 (diff) | |
Remove egl display type setenv hack
No longer needed with mesa 7.12-devel egl display autodetection.
| -rw-r--r-- | clients/simple-egl.c | 1 | ||||
| -rw-r--r-- | clients/window.c | 1 | ||||
| -rw-r--r-- | compositor/compositor-drm.c | 1 | ||||
| -rw-r--r-- | compositor/compositor-openwfd.c | 1 | ||||
| -rw-r--r-- | compositor/compositor-wayland.c | 1 | ||||
| -rw-r--r-- | compositor/compositor-x11.c | 1 | ||||
| -rw-r--r-- | compositor/meego-tablet-shell.c | 1 |
7 files changed, 0 insertions, 7 deletions
diff --git a/clients/simple-egl.c b/clients/simple-egl.c index ec09d683..35241378 100644 --- a/clients/simple-egl.c +++ b/clients/simple-egl.c @@ -106,7 +106,6 @@ init_egl(struct display *display) EGLint major, minor, n; EGLBoolean ret; - setenv("EGL_PLATFORM", "wayland", 1); display->egl.dpy = eglGetDisplay(display->display); assert(display->egl.dpy); diff --git a/clients/window.c b/clients/window.c index bc657908..bb0e5d81 100644 --- a/clients/window.c +++ b/clients/window.c @@ -1852,7 +1852,6 @@ init_egl(struct display *d) EGL_NONE }; - setenv("EGL_PLATFORM", "wayland", 1); d->dpy = eglGetDisplay(d->display); if (!eglInitialize(d->dpy, &major, &minor)) { fprintf(stderr, "failed to initialize display\n"); diff --git a/compositor/compositor-drm.c b/compositor/compositor-drm.c index 36136552..e1e94bc9 100644 --- a/compositor/compositor-drm.c +++ b/compositor/compositor-drm.c @@ -331,7 +331,6 @@ init_egl(struct drm_compositor *ec, struct udev_device *device) return -1; } - setenv("EGL_PLATFORM", "drm", 1); ec->drm.fd = fd; ec->gbm = gbm_create_device(ec->drm.fd); ec->base.display = eglGetDisplay(ec->gbm); diff --git a/compositor/compositor-openwfd.c b/compositor/compositor-openwfd.c index 71920409..144e4abf 100644 --- a/compositor/compositor-openwfd.c +++ b/compositor/compositor-openwfd.c @@ -133,7 +133,6 @@ init_egl(struct wfd_compositor *ec) return -1; ec->wfd_fd = fd; - setenv("EGL_PLATFORM", "drm", 1); ec->gbm = gbm_create_device(ec->wfd_fd); ec->base.display = eglGetDisplay(ec->gbm); if (ec->base.display == NULL) { diff --git a/compositor/compositor-wayland.c b/compositor/compositor-wayland.c index 9755c0ad..d143a60b 100644 --- a/compositor/compositor-wayland.c +++ b/compositor/compositor-wayland.c @@ -113,7 +113,6 @@ wayland_compositor_init_egl(struct wayland_compositor *c) EGL_NONE }; - setenv("EGL_PLATFORM", "wayland", 1); c->base.display = eglGetDisplay(c->parent.display); if (c->base.display == NULL) { fprintf(stderr, "failed to create display\n"); diff --git a/compositor/compositor-x11.c b/compositor/compositor-x11.c index f959e78d..72180291 100644 --- a/compositor/compositor-x11.c +++ b/compositor/compositor-x11.c @@ -116,7 +116,6 @@ x11_compositor_init_egl(struct x11_compositor *c) EGL_NONE }; - setenv("EGL_PLATFORM", "x11", 1); c->base.display = eglGetDisplay(c->dpy); if (c->base.display == NULL) { fprintf(stderr, "failed to create display\n"); diff --git a/compositor/meego-tablet-shell.c b/compositor/meego-tablet-shell.c index 6a797041..908f53e4 100644 --- a/compositor/meego-tablet-shell.c +++ b/compositor/meego-tablet-shell.c @@ -492,7 +492,6 @@ launch_ux_daemon(struct meego_tablet_shell *shell) snprintf(s, sizeof s, "%d", sv[1]); setenv("WAYLAND_SOCKET", s, 1); - setenv("EGL_PLATFORM", "wayland", 1); setenv("QT_QPA_PLATFORM", "waylandgl", 1); if (execl("/usr/libexec/meego-ux-daemon", "/usr/libexec/meego-ux-daemon", NULL) < 0) |