summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael Antognolli <antognolli@gmail.com>2013-01-04 16:00:43 +0000
committerRafael Antognolli <antognolli@gmail.com>2013-01-04 16:00:43 +0000
commitf8dbdafae60f42f3ac3cc1ef12516840ccacdd0c (patch)
tree995badf80ce5ef7881d26a2a391a0b249630052d
parent317979226c0d56e4362b775fee12e2b4c5812b17 (diff)
evas/wayland_egl: Force EGL_PLATFORM to wayland to skip autodetection.
Since we are already inside wayland_egl code, force this env var to avoid the EGLNativeDisplayType autodetection (done by EGL code), which seems to be incorrect. This commit should fix ticket #1972. Note: revert this as soon as EGL autodetection gets fixed. SVN revision: 82183
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_wl_main.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/modules/evas/engines/wayland_egl/evas_wl_main.c b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
index 417b56b..729389a 100644
--- a/src/modules/evas/engines/wayland_egl/evas_wl_main.c
+++ b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
@@ -68,6 +68,14 @@ eng_window_new(struct wl_display *disp, struct wl_surface *surface, int screen,
68 config_attrs[n++] = 0; 68 config_attrs[n++] = 0;
69 config_attrs[n++] = EGL_NONE; 69 config_attrs[n++] = EGL_NONE;
70 70
71 /* FIXME: Remove this line as soon as eglGetDisplay() autodetection
72 * gets fixed. Currently it is incorrectly detecting wl_display and
73 * returning _EGL_PLATFORM_X11 instead of _EGL_PLATFORM_WAYLAND.
74 *
75 * See ticket #1972 for more info.
76 */
77 setenv("EGL_PLATFORM", "wayland", 1);
78
71 gw->egl_disp = eglGetDisplay((EGLNativeDisplayType)(gw->disp)); 79 gw->egl_disp = eglGetDisplay((EGLNativeDisplayType)(gw->disp));
72 if (!gw->egl_disp) 80 if (!gw->egl_disp)
73 { 81 {