jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0d9005aa0ce3261d4bb7a00cd13dd78bffe31c08
commit 0d9005aa0ce3261d4bb7a00cd13dd78bffe31c08 Author: Jean-Philippe Andre <[email protected]> Date: Thu Jul 17 14:35:49 2014 +0900 Evas GLX: Simplify code if (A) then B else B --- src/modules/evas/engines/gl_x11/evas_x_main.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) 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 e78a644..2c28471 100644 --- a/src/modules/evas/engines/gl_x11/evas_x_main.c +++ b/src/modules/evas/engines/gl_x11/evas_x_main.c @@ -45,7 +45,6 @@ eng_window_new(Evas_Engine_Info_GL_X11 *info, int major_version, minor_version; int num_config, n = 0; #endif - XVisualInfo *vi_use; const GLubyte *vendor, *renderer, *version; int blacklist = 0; @@ -69,24 +68,10 @@ eng_window_new(Evas_Engine_Info_GL_X11 *info, gw->info = info; gw->evas = e; - vi_use = _evas_gl_x11_vi; - if (gw->alpha) - { -#ifdef GL_GLES - if (_evas_gl_x11_rgba_vi) - { - vi_use = _evas_gl_x11_rgba_vi; - } -#else -//#ifdef NEWGL - if (_evas_gl_x11_rgba_vi) - { - vi_use = _evas_gl_x11_rgba_vi; - } -//#endif -#endif - } - gw->visualinfo = vi_use; + if (gw->alpha && _evas_gl_x11_rgba_vi) + gw->visualinfo = _evas_gl_x11_rgba_vi; + else + gw->visualinfo = _evas_gl_x11_vi; // EGL / GLES #ifdef GL_GLES --
