kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "evas: GL_X11 context need to always be with alpha or it will fail to change." 

This reverts commit 12eeebb544.
This commit is contained in:
Eduardo Lima (Etrunko) 2014-10-20 11:34:53 -02:00
parent 4fb4d7c77c
commit d64e3a27e5
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/evas/engines/gl_x11/evas_engine.c
View File

@ -942,7 +942,6 @@ eng_setup(Evas *eo_e, void *in)
{ {
inc = 1; inc = 1;
eng_window_free(re->win); eng_window_free(re->win);
re->win->gl_context->references++;
gl_wins--; gl_wins--;
} }
re->w = e->output.w; re->w = e->output.w;

2
src/modules/evas/engines/gl_x11/evas_engine.h
View File

@ -94,7 +94,7 @@ struct _Evas_GL_X11_Window
Evas_GL_X11_Window *eng_window_new(Display *disp, Window win, int screen, Evas_GL_X11_Window *eng_window_new(Display *disp, Window win, int screen,
Visual *vis, Colormap cmap, Visual *vis, Colormap cmap,
int depth, int w, int h, int indirect, int depth, int w, int h, int indirect,
int rot); int alpha, int rot);
void eng_window_free(Evas_GL_X11_Window *gw); void eng_window_free(Evas_GL_X11_Window *gw);
void eng_window_use(Evas_GL_X11_Window *gw); void eng_window_use(Evas_GL_X11_Window *gw);
void eng_window_unsurf(Evas_GL_X11_Window *gw); void eng_window_unsurf(Evas_GL_X11_Window *gw);

15
src/modules/evas/engines/gl_x11/evas_x_main.c
View File

@ -32,6 +32,7 @@ eng_window_new(Display *disp,
int w, int w,
int h, int h,
int indirect, int indirect,
int alpha,
int rot) int rot)
{ {
Evas_GL_X11_Window *gw; Evas_GL_X11_Window *gw;
@ -57,7 +58,7 @@ eng_window_new(Display *disp,
gw->visual = vis; gw->visual = vis;
gw->colormap = cmap; gw->colormap = cmap;
gw->depth = depth; gw->depth = depth;
gw->alpha = 1; gw->alpha = alpha;
gw->w = w; gw->w = w;
gw->h = h; gw->h = h;
gw->rot = rot; gw->rot = rot;
@ -101,8 +102,16 @@ eng_window_new(Display *disp,
config_attrs[n++] = 1; config_attrs[n++] = 1;
// FIXME: end n900 breakage // FIXME: end n900 breakage
# endif # endif
config_attrs[n++] = EGL_ALPHA_SIZE; if (gw->alpha)
config_attrs[n++] = 1; {
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_DEPTH_SIZE; config_attrs[n++] = EGL_DEPTH_SIZE;
config_attrs[n++] = 0; config_attrs[n++] = 0;
config_attrs[n++] = EGL_STENCIL_SIZE; config_attrs[n++] = EGL_STENCIL_SIZE;