diff options
| author | jutty.lee <jutty.lee@samsung.com> | 2016-11-04 15:09:01 +0900 |
|---|---|---|
| committer | Haegeun Park <haegeun.park@samsung.com> | 2017-01-11 18:20:36 +0900 |
| commit | 15b99e16980a21c32a5231be243d3b09b38b6bd6 (patch) | |
| tree | fc69b3d141f9b97d1517ecaeec196687b82024a1 | |
| parent | c4295b2494b6b28873519ad4a5b335f87d86a5b0 (diff) | |
| download | efl-15b99e16980a21c32a5231be243d3b09b38b6bd6.tar.gz | |
evas/gl_x11: (GL thread) Modified glX functions to perform threaded call
| -rw-r--r-- | src/modules/evas/engines/gl_x11/evas_engine.c | 8 | ||||
| -rw-r--r-- | src/modules/evas/engines/gl_x11/evas_x_main.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c index 1556cfdbc8..ba51c6c6bb 100644 --- a/src/modules/evas/engines/gl_x11/evas_engine.c +++ b/src/modules/evas/engines/gl_x11/evas_engine.c @@ -253,7 +253,7 @@ evgl_eng_make_current(void *data, void *surface, void *context, int flush) ret = evas_eglMakeCurrent(dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); if (!ret) { - int err = evas_eglGetError_th(); + int err = evas_eglGetError_evgl_th(); glsym_evas_gl_common_error_set(err - EGL_SUCCESS); ERR("evas_eglMakeCurrent() failed! Error Code=%#x", err); return 0; @@ -276,7 +276,7 @@ evgl_eng_make_current(void *data, void *surface, void *context, int flush) if (!ret) { - int err = evas_eglGetError_th(); + int err = evas_eglGetError_evgl_th(); glsym_evas_gl_common_error_set(err - EGL_SUCCESS); ERR("evas_eglMakeCurrent() failed! Error Code=%#x", err); return 0; @@ -301,7 +301,7 @@ evgl_eng_make_current(void *data, void *surface, void *context, int flush) } - if ((glXGetCurrentContext() != ctx)) + if ((evas_glXGetCurrentContext_evgl_th() != ctx)) { //!!!! Does it need to be flushed with it's set to NULL above?? // Flush remainder of what's in Evas' pipeline @@ -1924,7 +1924,7 @@ eng_gl_current_context_get(void *data EINA_UNUSED) if (evas_eglGetCurrentContext() == context) return ctx; #else - if (glXGetCurrentContext() == context) + if (evas_glXGetCurrentContext_th() == context) return ctx; #endif diff --git a/src/modules/evas/engines/gl_x11/evas_x_main.c b/src/modules/evas/engines/gl_x11/evas_x_main.c index 8acef168f4..d08d2fb3a8 100644 --- a/src/modules/evas/engines/gl_x11/evas_x_main.c +++ b/src/modules/evas/engines/gl_x11/evas_x_main.c @@ -706,7 +706,7 @@ eng_window_use(Outbuf *gw) #else if (xwin) { - if (glXGetCurrentContext() != xwin->context) + if (evas_glXGetCurrentContext_th() != xwin->context) force_use = EINA_TRUE; } #endif @@ -1664,7 +1664,7 @@ eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage EINA_UNUSED, Tilebuf_R #endif // XXX: if partial swaps can be done use re->rects // measure(0, "swap"); - glXSwapBuffers(ob->disp, ob->glxwin); + evas_glXSwapBuffers_th(ob->disp, ob->glxwin); // measure(1, "swap"); #endif // clear out rects after swap as we may use them during swap |