diff options
| author | Cedric BAIL <cedric@osg.samsung.com> | 2014-10-09 12:20:53 +0200 |
|---|---|---|
| committer | Cedric BAIL <cedric@osg.samsung.com> | 2014-10-09 12:27:07 +0200 |
| commit | cd64a648ce3c8b215950380fc0dcb60e3122c89f (patch) | |
| tree | e1386961e703fc0ea569ea71a0decb229d5ba1ed | |
| parent | abedbd3d7f928557518bdf88aac913bf0ccae94b (diff) | |
| download | efl-cd64a648ce3c8b215950380fc0dcb60e3122c89f.tar.gz | |
evas: GL_X11 context need to always be with alpha or it will fail to change.
@fix
| -rw-r--r-- | src/modules/evas/engines/gl_x11/evas_engine.c | 1 | ||||
| -rw-r--r-- | src/modules/evas/engines/gl_x11/evas_engine.h | 2 | ||||
| -rw-r--r-- | src/modules/evas/engines/gl_x11/evas_x_main.c | 15 |
3 files changed, 5 insertions, 13 deletions
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c index 2b30e5faee..7abda508a5 100644 --- a/src/modules/evas/engines/gl_x11/evas_engine.c +++ b/src/modules/evas/engines/gl_x11/evas_engine.c @@ -945,6 +945,7 @@ eng_setup(Evas *eo_e, void *in) { inc = 1; eng_window_free(re->win); + re->win->gl_context->references++; gl_wins--; } re->w = e->output.w; diff --git a/src/modules/evas/engines/gl_x11/evas_engine.h b/src/modules/evas/engines/gl_x11/evas_engine.h index 2ae3757f44..5357f609b4 100644 --- a/src/modules/evas/engines/gl_x11/evas_engine.h +++ b/src/modules/evas/engines/gl_x11/evas_engine.h @@ -109,7 +109,7 @@ struct _Evas_GL_X11_Context Evas_GL_X11_Window *eng_window_new(Display *disp, Window win, int screen, Visual *vis, Colormap cmap, int depth, int w, int h, int indirect, - int alpha, int rot); + int rot); void eng_window_free(Evas_GL_X11_Window *gw); void eng_window_use(Evas_GL_X11_Window *gw); void eng_window_unsurf(Evas_GL_X11_Window *gw); 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 92fe2d0286..08bd091d06 100644 --- a/src/modules/evas/engines/gl_x11/evas_x_main.c +++ b/src/modules/evas/engines/gl_x11/evas_x_main.c @@ -32,7 +32,6 @@ eng_window_new(Display *disp, int w, int h, int indirect, - int alpha, int rot) { Evas_GL_X11_Window *gw; @@ -58,7 +57,7 @@ eng_window_new(Display *disp, gw->visual = vis; gw->colormap = cmap; gw->depth = depth; - gw->alpha = alpha; + gw->alpha = 1; gw->w = w; gw->h = h; gw->rot = rot; @@ -102,16 +101,8 @@ eng_window_new(Display *disp, config_attrs[n++] = 1; // FIXME: end n900 breakage # endif - if (gw->alpha) - { - config_attrs[n++] = EGL_ALPHA_SIZE; - config_attrs[n++] = 1; - } - else - { - config_attrs[n++] = EGL_ALPHA_SIZE; - config_attrs[n++] = 0; - } + config_attrs[n++] = EGL_ALPHA_SIZE; + config_attrs[n++] = 1; config_attrs[n++] = EGL_DEPTH_SIZE; config_attrs[n++] = 0; config_attrs[n++] = EGL_STENCIL_SIZE; |