summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Lima (Etrunko) <eduardo.lima@intel.com>2014-10-20 11:34:53 -0200
committerEduardo Lima (Etrunko) <eduardo.lima@intel.com>2014-10-20 11:34:53 -0200
commitd64e3a27e510abfb8377d636fb72f30842c9af89 (patch)
tree9210731012c8ca7c068a06fd7011629d303b17f3
parent4fb4d7c77c215861593d45bec735dc1f068fb720 (diff)
Revert "evas: GL_X11 context need to always be with alpha or it will fail to change."
This reverts commit 12eeebb5447cd9ea8227ac715e0fd55a2fdadaf8.
-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 a27cf30851..e1caf3a19e 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -942,7 +942,6 @@ eng_setup(Evas *eo_e, void *in)
942 { 942 {
943 inc = 1; 943 inc = 1;
944 eng_window_free(re->win); 944 eng_window_free(re->win);
945 re->win->gl_context->references++;
946 gl_wins--; 945 gl_wins--;
947 } 946 }
948 re->w = e->output.w; 947 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 9a222bafa0..c03950b907 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;