summaryrefslogtreecommitdiff
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
parent8862fc38b451fb8a598876111871336fe0749387 (diff)
Revert "evas: GL_X11 context need to always be with alpha or it will fail to change."
This reverts commit 8862fc38b451fb8a598876111871336fe0749387.
-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)
938 { 938 {
939 inc = 1; 939 inc = 1;
940 eng_window_free(re->win); 940 eng_window_free(re->win);
941 re->win->gl_context->references++;
942 gl_wins--; 941 gl_wins--;
943 } 942 }
944 re->w = e->output.w; 943 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
94Evas_GL_X11_Window *eng_window_new(Display *disp, Window win, int screen, 94Evas_GL_X11_Window *eng_window_new(Display *disp, Window win, int screen,
95 Visual *vis, Colormap cmap, 95 Visual *vis, Colormap cmap,
96 int depth, int w, int h, int indirect, 96 int depth, int w, int h, int indirect,
97 int rot); 97 int alpha, int rot);
98void eng_window_free(Evas_GL_X11_Window *gw); 98void eng_window_free(Evas_GL_X11_Window *gw);
99void eng_window_use(Evas_GL_X11_Window *gw); 99void eng_window_use(Evas_GL_X11_Window *gw);
100void eng_window_unsurf(Evas_GL_X11_Window *gw); 100void 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,
32 int w, 32 int w,
33 int h, 33 int h,
34 int indirect, 34 int indirect,
35 int alpha,
35 int rot) 36 int rot)
36{ 37{
37 Evas_GL_X11_Window *gw; 38 Evas_GL_X11_Window *gw;
@@ -57,7 +58,7 @@ eng_window_new(Display *disp,
57 gw->visual = vis; 58 gw->visual = vis;
58 gw->colormap = cmap; 59 gw->colormap = cmap;
59 gw->depth = depth; 60 gw->depth = depth;
60 gw->alpha = 1; 61 gw->alpha = alpha;
61 gw->w = w; 62 gw->w = w;
62 gw->h = h; 63 gw->h = h;
63 gw->rot = rot; 64 gw->rot = rot;
@@ -101,8 +102,16 @@ eng_window_new(Display *disp,
101 config_attrs[n++] = 1; 102 config_attrs[n++] = 1;
102// FIXME: end n900 breakage 103// FIXME: end n900 breakage
103# endif 104# endif
104 config_attrs[n++] = EGL_ALPHA_SIZE; 105 if (gw->alpha)
105 config_attrs[n++] = 1; 106 {
107 config_attrs[n++] = EGL_ALPHA_SIZE;
108 config_attrs[n++] = 1;
109 }
110 else
111 {
112 config_attrs[n++] = EGL_ALPHA_SIZE;
113 config_attrs[n++] = 0;
114 }
106 config_attrs[n++] = EGL_DEPTH_SIZE; 115 config_attrs[n++] = EGL_DEPTH_SIZE;
107 config_attrs[n++] = 0; 116 config_attrs[n++] = 0;
108 config_attrs[n++] = EGL_STENCIL_SIZE; 117 config_attrs[n++] = EGL_STENCIL_SIZE;