mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove egl display type setenv hack

Browse Source 
No longer needed with mesa 7.12-devel egl display autodetection.
This commit is contained in:
Benjamin Franzke
2011-08-09 14:33:45 +02:00
committed by Kristian Høgsberg
parent 48c4ea2dbd
commit 91eacca38b
7 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/simple-egl.c
-1
View File
@@ -106,7 +106,6 @@ init_egl(struct display *display)
EGLint major, minor, n; EGLint major, minor, n;
EGLBoolean ret; EGLBoolean ret;
setenv("EGL_PLATFORM", "wayland", 1);
display->egl.dpy = eglGetDisplay(display->display); display->egl.dpy = eglGetDisplay(display->display);
assert(display->egl.dpy); assert(display->egl.dpy);
clients/window.c
-1
View File
@@ -1852,7 +1852,6 @@ init_egl(struct display *d)
EGL_NONE EGL_NONE
}; };
setenv("EGL_PLATFORM", "wayland", 1);
d->dpy = eglGetDisplay(d->display); d->dpy = eglGetDisplay(d->display);
if (!eglInitialize(d->dpy, &major, &minor)) { if (!eglInitialize(d->dpy, &major, &minor)) {
fprintf(stderr, "failed to initialize display\n"); fprintf(stderr, "failed to initialize display\n");
compositor/compositor-drm.c
-1
View File
@@ -331,7 +331,6 @@ init_egl(struct drm_compositor *ec, struct udev_device *device)
return -1; return -1;
} }
setenv("EGL_PLATFORM", "drm", 1);
ec->drm.fd = fd; ec->drm.fd = fd;
ec->gbm = gbm_create_device(ec->drm.fd); ec->gbm = gbm_create_device(ec->drm.fd);
ec->base.display = eglGetDisplay(ec->gbm); ec->base.display = eglGetDisplay(ec->gbm);
compositor/compositor-openwfd.c
-1
View File
@@ -133,7 +133,6 @@ init_egl(struct wfd_compositor *ec)
return -1; return -1;
ec->wfd_fd = fd; ec->wfd_fd = fd;
setenv("EGL_PLATFORM", "drm", 1);
ec->gbm = gbm_create_device(ec->wfd_fd); ec->gbm = gbm_create_device(ec->wfd_fd);
ec->base.display = eglGetDisplay(ec->gbm); ec->base.display = eglGetDisplay(ec->gbm);
if (ec->base.display == NULL) { if (ec->base.display == NULL) {
compositor/compositor-wayland.c
-1
View File
@@ -113,7 +113,6 @@ wayland_compositor_init_egl(struct wayland_compositor *c)
EGL_NONE EGL_NONE
}; };
setenv("EGL_PLATFORM", "wayland", 1);
c->base.display = eglGetDisplay(c->parent.display); c->base.display = eglGetDisplay(c->parent.display);
if (c->base.display == NULL) { if (c->base.display == NULL) {
fprintf(stderr, "failed to create display\n"); fprintf(stderr, "failed to create display\n");
compositor/compositor-x11.c
-1
View File
@@ -116,7 +116,6 @@ x11_compositor_init_egl(struct x11_compositor *c)
EGL_NONE EGL_NONE
}; };
setenv("EGL_PLATFORM", "x11", 1);
c->base.display = eglGetDisplay(c->dpy); c->base.display = eglGetDisplay(c->dpy);
if (c->base.display == NULL) { if (c->base.display == NULL) {
fprintf(stderr, "failed to create display\n"); fprintf(stderr, "failed to create display\n");
compositor/meego-tablet-shell.c
-1
View File
@@ -492,7 +492,6 @@ launch_ux_daemon(struct meego_tablet_shell *shell)
snprintf(s, sizeof s, "%d", sv[1]); snprintf(s, sizeof s, "%d", sv[1]);
setenv("WAYLAND_SOCKET", s, 1); setenv("WAYLAND_SOCKET", s, 1);
setenv("EGL_PLATFORM", "wayland", 1);
setenv("QT_QPA_PLATFORM", "waylandgl", 1); setenv("QT_QPA_PLATFORM", "waylandgl", 1);
if (execl("/usr/libexec/meego-ux-daemon", if (execl("/usr/libexec/meego-ux-daemon",
"/usr/libexec/meego-ux-daemon", NULL) < 0) "/usr/libexec/meego-ux-daemon", NULL) < 0)