From 0fbe5fe4720365131121be64615268349d3a1ecc Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Mon, 22 May 2017 08:58:32 +0900 Subject: [PATCH] [evas_gl_thread] code cleanup : removed unuse code Change-Id: I61dbde80d76a3d4d7588e1d090e7a5848ad810d9 --- src/modules/evas/engines/wayland_egl/evas_engine.c | 36 ---------------------- 1 file changed, 36 deletions(-) diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c index e7f782d..19faa1d 100644 --- a/src/modules/evas/engines/wayland_egl/evas_engine.c +++ b/src/modules/evas/engines/wayland_egl/evas_engine.c @@ -642,17 +642,6 @@ evgl_eng_make_current(void *data, void *surface, void *ctxt, int flush) if ((!ctxt) && (!surface)) { -#ifdef SCORE_EGL_MOVE_TO_OTHER_THREAD - ret = eglMakeCurrent_evgl_thread_cmd(ob->egl_disp, EGL_NO_SURFACE, - EGL_NO_SURFACE, EGL_NO_CONTEXT); - if (!ret) - { - int err = eglGetError_evgl_thread_cmd(); - glsym_evas_gl_common_error_set(err - EGL_SUCCESS); - ERR("eglMakeCurrent failed! Error Code=%#x", err); - return 0; - } -#else ret = eglMakeCurrent_thread_cmd(ob->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); @@ -663,31 +652,9 @@ evgl_eng_make_current(void *data, void *surface, void *ctxt, int flush) ERR("eglMakeCurrent() failed! Error Code=%#x", err); return 0; } -#endif return 1; } -#ifdef SCORE_EGL_MOVE_TO_OTHER_THREAD - if ((eglGetCurrentContext_evgl_thread_cmd() != ctx) || - (eglGetCurrentSurface_evgl_thread_cmd(EGL_READ) != surf) || - (eglGetCurrentSurface_evgl_thread_cmd(EGL_DRAW) != surf) ) - { - //!!!! Does it need to be flushed with it's set to NULL above?? - // Flush remainder of what's in Evas' pipeline - //if (flush) eng_window_use(NULL); - - ret = eglMakeCurrent_evgl_thread_cmd(ob->egl_disp, surf, surf, ctx); - if (!ret) - { - int err = eglGetError_evgl_thread_cmd(); - glsym_evas_gl_common_error_set(err - EGL_SUCCESS); - ERR("eglMakeCurrent() failed! Error Code=%#x", err); - return 0; - } - } - -#else - if ((eglGetCurrentContext_thread_cmd() != ctx) || (eglGetCurrentSurface_thread_cmd(EGL_READ) != surf) || (eglGetCurrentSurface_thread_cmd(EGL_DRAW) != surf)) @@ -703,9 +670,6 @@ evgl_eng_make_current(void *data, void *surface, void *ctxt, int flush) return 0; } } - -#endif - return 1; } -- 2.7.4