aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduardo Lima (Etrunko) <eduardo.lima@intel.com>2014-10-20 11:36:00 -0200
committerEduardo Lima (Etrunko) <eduardo.lima@intel.com>2014-10-20 11:36:00 -0200
commit7e6a10b64b679f9cb184a192d5402a9676d0d8a4 (patch)
treef6967602c4a8726818a6aef45b37a2529a6a55cf
parentevas: GL_X11 context need to always be with alpha or it will fail to change. (diff)
downloadefl-7e6a10b64b679f9cb184a192d5402a9676d0d8a4.tar.gz
Revert "evas: GL_X11 context need to always be with alpha or it will fail to change."
-rw-r--r--src/modules/evas/engines/gl_x11/evas_engine.c1
-rw-r--r--src/modules/evas/engines/gl_x11/evas_engine.h2
-rw-r--r--src/modules/evas/engines/gl_x11/evas_x_main.c15
3 files changed, 13 insertions, 5 deletions
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c
index db2e40b5e2..ac3397c10d 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -938,7 +938,6 @@ 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 932156c360..371a10b39d 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.h
+++ b/src/modules/evas/engines/gl_x11/evas_engine.h
@@ -94,7 +94,7 @@ struct _Evas_GL_X11_Window
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 rot);
+ int alpha, 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 ad81f9982e..1b7cab645b 100644
--- a/src/modules/evas/engines/gl_x11/evas_x_main.c
+++ b/src/modules/evas/engines/gl_x11/evas_x_main.c
@@ -32,6 +32,7 @@ eng_window_new(Display *disp,
int w,
int h,
int indirect,
+ int alpha,
int rot)
{
Evas_GL_X11_Window *gw;
@@ -57,7 +58,7 @@ eng_window_new(Display *disp,
gw->visual = vis;
gw->colormap = cmap;
gw->depth = depth;
- gw->alpha = 1;
+ gw->alpha = alpha;
gw->w = w;
gw->h = h;
gw->rot = rot;
@@ -101,8 +102,16 @@ eng_window_new(Display *disp,
config_attrs[n++] = 1;
// FIXME: end n900 breakage
# endif
- config_attrs[n++] = EGL_ALPHA_SIZE;
- config_attrs[n++] = 1;
+ 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_DEPTH_SIZE;
config_attrs[n++] = 0;
config_attrs[n++] = EGL_STENCIL_SIZE;