antognolli pushed a commit to branch evas-1.7.
commit ad4c2bf928de11ca4a85014ef6299edb8ce6ae77
Author: Rafael Antognolli <[email protected]>
Date: Thu Jun 27 15:01:20 2013 -0300
Backport r82183 (f8dbdafae60f42f3ac3cc1ef12516840ccacdd0c).
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.
---
ChangeLog | 5 +++++
src/modules/engines/wayland_egl/evas_wl_main.c | 7 +++++++
2 files changed, 12 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 5c2c826..f37a14b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1319,3 +1319,8 @@
2013-06-26 Daniel Willmann
* Evas: Fix evas_common_convert_yuv_42* functions to actually return
the converted data.
+
+2013-06-27 Rafael Antognolli
+
+ * Evas/Wayland_EGL: Force EGL_PLATFORM to wayland to skip
+ autodetection.
diff --git a/src/modules/engines/wayland_egl/evas_wl_main.c
b/src/modules/engines/wayland_egl/evas_wl_main.c
index b7ec16f..1a2886f 100644
--- a/src/modules/engines/wayland_egl/evas_wl_main.c
+++ b/src/modules/engines/wayland_egl/evas_wl_main.c
@@ -38,6 +38,13 @@ eng_window_new(struct wl_display *disp, struct wl_surface
*surface, int screen,
context_attrs[1] = 2;
context_attrs[2] = EGL_NONE;
+ /* FIXME: Remove this line as soon as eglGetDisplay() autodetection
+ * gets fixed. Currently it is incorrectly detecting wl_display and
+ * returning _EGL_PLATFORM_X11 instead of _EGL_PLATFORM_WAYLAND.
+ */
+ setenv("EGL_PLATFORM", "wayland", 1);
+
+
#if defined(GLES_VARIETY_S3C6410)
if (gw->depth == 16) // 16bpp
{
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
