summaryrefslogtreecommitdiff
path: root/src/modules/evas
diff options
context:
space:
mode:
authorCedric BAIL <c.bail@partner.samsung.com>2014-07-01 08:43:27 +0200
committerCedric BAIL <c.bail@partner.samsung.com>2014-07-04 15:11:22 +0200
commit4be4991315973c7b0ea31b00e77fd837e2f8761d (patch)
tree3db02cb3e1d38fcb81d69a4ca832260d32577bf4 /src/modules/evas
parentab6dd99ed8d217e7c818460a447cf1acf1a789e1 (diff)
evas: rename Evas_GL_X11_Window to Outbuf.
Diffstat (limited to 'src/modules/evas')
-rw-r--r--src/modules/evas/engines/gl_x11/evas_engine.c2
-rw-r--r--src/modules/evas/engines/gl_x11/evas_engine.h16
-rw-r--r--src/modules/evas/engines/gl_x11/evas_x_main.c20
3 files changed, 19 insertions, 19 deletions
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c
index 4e8d595..f26903d 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -49,7 +49,7 @@ struct _Render_Engine
49 Tilebuf_Rect *rects_prev[4]; 49 Tilebuf_Rect *rects_prev[4];
50 Eina_Inlist *cur_rect; 50 Eina_Inlist *cur_rect;
51 51
52 Evas_GL_X11_Window *win; 52 Outbuf *win;
53 Evas_Engine_Info_GL_X11 *info; 53 Evas_Engine_Info_GL_X11 *info;
54 Evas *evas; 54 Evas *evas;
55 Tilebuf *tb; 55 Tilebuf *tb;
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.h b/src/modules/evas/engines/gl_x11/evas_engine.h
index 2ae3757..42d346a 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.h
+++ b/src/modules/evas/engines/gl_x11/evas_engine.h
@@ -57,10 +57,10 @@ extern int _evas_engine_GL_X11_log_dom ;
57#endif 57#endif
58#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_X11_log_dom, __VA_ARGS__) 58#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_X11_log_dom, __VA_ARGS__)
59 59
60typedef struct _Evas_GL_X11_Window Evas_GL_X11_Window; 60typedef struct _Outbuf Outbuf;
61typedef struct _Evas_GL_X11_Context Evas_GL_X11_Context; 61typedef struct _Evas_GL_X11_Context Evas_GL_X11_Context;
62 62
63struct _Evas_GL_X11_Window 63struct _Outbuf
64{ 64{
65 Display *disp; 65 Display *disp;
66 Window win; 66 Window win;
@@ -106,20 +106,20 @@ struct _Evas_GL_X11_Context
106#endif 106#endif
107}; 107};
108 108
109Evas_GL_X11_Window *eng_window_new(Display *disp, Window win, int screen, 109Outbuf *eng_window_new(Display *disp, Window win, int screen,
110 Visual *vis, Colormap cmap, 110 Visual *vis, Colormap cmap,
111 int depth, int w, int h, int indirect, 111 int depth, int w, int h, int indirect,
112 int alpha, int rot); 112 int alpha, int rot);
113void eng_window_free(Evas_GL_X11_Window *gw); 113void eng_window_free(Outbuf *gw);
114void eng_window_use(Evas_GL_X11_Window *gw); 114void eng_window_use(Outbuf *gw);
115void eng_window_unsurf(Evas_GL_X11_Window *gw); 115void eng_window_unsurf(Outbuf *gw);
116void eng_window_resurf(Evas_GL_X11_Window *gw); 116void eng_window_resurf(Outbuf *gw);
117 117
118void *eng_best_visual_get(Evas_Engine_Info_GL_X11 *einfo); 118void *eng_best_visual_get(Evas_Engine_Info_GL_X11 *einfo);
119Colormap eng_best_colormap_get(Evas_Engine_Info_GL_X11 *einfo); 119Colormap eng_best_colormap_get(Evas_Engine_Info_GL_X11 *einfo);
120int eng_best_depth_get(Evas_Engine_Info_GL_X11 *einfo); 120int eng_best_depth_get(Evas_Engine_Info_GL_X11 *einfo);
121 121
122Evas_GL_X11_Context *eng_gl_context_new(Evas_GL_X11_Window *win); 122Evas_GL_X11_Context *eng_gl_context_new(Outbuf *win);
123void eng_gl_context_free(Evas_GL_X11_Context *context); 123void eng_gl_context_free(Evas_GL_X11_Context *context);
124void eng_gl_context_use(Evas_GL_X11_Context *context); 124void eng_gl_context_use(Evas_GL_X11_Context *context);
125 125
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 92fe2d0..b3dc5f5 100644
--- a/src/modules/evas/engines/gl_x11/evas_x_main.c
+++ b/src/modules/evas/engines/gl_x11/evas_x_main.c
@@ -1,6 +1,6 @@
1#include "evas_engine.h" 1#include "evas_engine.h"
2 2
3static Evas_GL_X11_Window *_evas_gl_x11_window = NULL; 3static Outbuf *_evas_gl_x11_window = NULL;
4 4
5#ifdef GL_GLES 5#ifdef GL_GLES
6static EGLContext context = EGL_NO_CONTEXT; 6static EGLContext context = EGL_NO_CONTEXT;
@@ -22,7 +22,7 @@ static Colormap _evas_gl_x11_rgba_cmap = 0;
22 22
23static int win_count = 0; 23static int win_count = 0;
24 24
25Evas_GL_X11_Window * 25Outbuf *
26eng_window_new(Display *disp, 26eng_window_new(Display *disp,
27 Window win, 27 Window win,
28 int screen, 28 int screen,
@@ -35,7 +35,7 @@ eng_window_new(Display *disp,
35 int alpha, 35 int alpha,
36 int rot) 36 int rot)
37{ 37{
38 Evas_GL_X11_Window *gw; 38 Outbuf *gw;
39#ifdef GL_GLES 39#ifdef GL_GLES
40 int context_attrs[3]; 40 int context_attrs[3];
41 int config_attrs[40]; 41 int config_attrs[40];
@@ -48,7 +48,7 @@ eng_window_new(Display *disp,
48 48
49 if (!_evas_gl_x11_vi) return NULL; 49 if (!_evas_gl_x11_vi) return NULL;
50 50
51 gw = calloc(1, sizeof(Evas_GL_X11_Window)); 51 gw = calloc(1, sizeof(Outbuf));
52 if (!gw) return NULL; 52 if (!gw) return NULL;
53 53
54 win_count++; 54 win_count++;
@@ -416,7 +416,7 @@ eng_window_new(Display *disp,
416} 416}
417 417
418void 418void
419eng_window_free(Evas_GL_X11_Window *gw) 419eng_window_free(Outbuf *gw)
420{ 420{
421 int ref = 0; 421 int ref = 0;
422 win_count--; 422 win_count--;
@@ -458,7 +458,7 @@ eng_window_free(Evas_GL_X11_Window *gw)
458static Eina_Bool 458static Eina_Bool
459eng_window_make_current(void *data, void *doit) 459eng_window_make_current(void *data, void *doit)
460{ 460{
461 Evas_GL_X11_Window *gw = data; 461 Outbuf *gw = data;
462 462
463#ifdef GL_GLES 463#ifdef GL_GLES
464 if (doit) 464 if (doit)
@@ -501,7 +501,7 @@ eng_window_make_current(void *data, void *doit)
501} 501}
502 502
503void 503void
504eng_window_use(Evas_GL_X11_Window *gw) 504eng_window_use(Outbuf *gw)
505{ 505{
506 Eina_Bool force_use = EINA_FALSE; 506 Eina_Bool force_use = EINA_FALSE;
507 507
@@ -565,7 +565,7 @@ eng_window_use(Evas_GL_X11_Window *gw)
565} 565}
566 566
567void 567void
568eng_window_unsurf(Evas_GL_X11_Window *gw) 568eng_window_unsurf(Outbuf *gw)
569{ 569{
570 if (!gw->surf) return; 570 if (!gw->surf) return;
571 if (!getenv("EVAS_GL_WIN_RESURF")) return; 571 if (!getenv("EVAS_GL_WIN_RESURF")) return;
@@ -596,7 +596,7 @@ eng_window_unsurf(Evas_GL_X11_Window *gw)
596} 596}
597 597
598void 598void
599eng_window_resurf(Evas_GL_X11_Window *gw) 599eng_window_resurf(Outbuf *gw)
600{ 600{
601 if (gw->surf) return; 601 if (gw->surf) return;
602 if (getenv("EVAS_GL_INFO")) 602 if (getenv("EVAS_GL_INFO"))
@@ -851,7 +851,7 @@ eng_best_depth_get(Evas_Engine_Info_GL_X11 *einfo)
851} 851}
852 852
853Evas_GL_X11_Context * 853Evas_GL_X11_Context *
854eng_gl_context_new(Evas_GL_X11_Window *win) 854eng_gl_context_new(Outbuf *win)
855{ 855{
856 Evas_GL_X11_Context *ctx; 856 Evas_GL_X11_Context *ctx;
857#if GL_GLES 857#if GL_GLES