From 77c4ee161dc7c1252a02cbd29ae4d44a1b5b7241 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 7 Aug 2017 10:02:07 -0400 Subject: [PATCH] evas wayland: call makecurrent before querying gl attrs fix T5845 --- src/modules/evas/engines/wayland_egl/evas_wl_main.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 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 59c69c6..cb1e1ea 100644 --- a/src/modules/evas/engines/wayland_egl/evas_wl_main.c +++ b/src/modules/evas/engines/wayland_egl/evas_wl_main.c @@ -111,7 +111,13 @@ eng_window_new(Evas_Engine_Info_Wayland *einfo, int w, int h, Render_Engine_Swap } if (context == EGL_NO_CONTEXT) context = gw->egl_context; - + if (eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE, + EGL_NO_SURFACE, gw->egl_context) == EGL_FALSE) + { + ERR("eglMakeCurrent() fail. code=%#x", eglGetError()); + eng_window_free(gw); + return NULL; + } vendor = glGetString(GL_VENDOR); renderer = glGetString(GL_RENDERER); version = glGetString(GL_VERSION); @@ -148,13 +154,6 @@ eng_window_new(Evas_Engine_Info_Wayland *einfo, int w, int h, Render_Engine_Swap eng_window_resurf(gw); else { - if (eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE, - EGL_NO_SURFACE, gw->egl_context) == EGL_FALSE) - { - ERR("eglMakeCurrent() fail. code=%#x", eglGetError()); - eng_window_free(gw); - return NULL; - } eng_gl_symbols(gw->egl_disp); if (!(gw->gl_context = glsym_evas_gl_common_context_new())) -- 2.7.4