summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-08-07 10:02:07 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-08-07 10:54:04 -0400
commitb9e97da869db080ca90b7a0bbedc70c64b65e82b (patch)
tree260a1c04321ce336f3866eea68066e277ea442ba
parentfcea581d6106bc223049123d54281a7d04275668 (diff)
evas wayland: call makecurrent before querying gl attrs
fix T5845
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_wl_main.c15
1 files 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 59c69c6dfb..cb1e1ea260 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
111 } 111 }
112 112
113 if (context == EGL_NO_CONTEXT) context = gw->egl_context; 113 if (context == EGL_NO_CONTEXT) context = gw->egl_context;
114 114 if (eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE,
115 EGL_NO_SURFACE, gw->egl_context) == EGL_FALSE)
116 {
117 ERR("eglMakeCurrent() fail. code=%#x", eglGetError());
118 eng_window_free(gw);
119 return NULL;
120 }
115 vendor = glGetString(GL_VENDOR); 121 vendor = glGetString(GL_VENDOR);
116 renderer = glGetString(GL_RENDERER); 122 renderer = glGetString(GL_RENDERER);
117 version = glGetString(GL_VERSION); 123 version = glGetString(GL_VERSION);
@@ -148,13 +154,6 @@ eng_window_new(Evas_Engine_Info_Wayland *einfo, int w, int h, Render_Engine_Swap
148 eng_window_resurf(gw); 154 eng_window_resurf(gw);
149 else 155 else
150 { 156 {
151 if (eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE,
152 EGL_NO_SURFACE, gw->egl_context) == EGL_FALSE)
153 {
154 ERR("eglMakeCurrent() fail. code=%#x", eglGetError());
155 eng_window_free(gw);
156 return NULL;
157 }
158 eng_gl_symbols(gw->egl_disp); 157 eng_gl_symbols(gw->egl_disp);
159 158
160 if (!(gw->gl_context = glsym_evas_gl_common_context_new())) 159 if (!(gw->gl_context = glsym_evas_gl_common_context_new()))