From 4be4991315973c7b0ea31b00e77fd837e2f8761d Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Tue, 1 Jul 2014 08:43:27 +0200 Subject: [PATCH] evas: rename Evas_GL_X11_Window to Outbuf. --- src/modules/evas/engines/gl_x11/evas_engine.c | 2 +- src/modules/evas/engines/gl_x11/evas_engine.h | 16 +++++++-------- src/modules/evas/engines/gl_x11/evas_x_main.c | 20 +++++++++---------- 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 4e8d595fb0..f26903d430 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 Tilebuf_Rect *rects_prev[4]; Eina_Inlist *cur_rect; - Evas_GL_X11_Window *win; + Outbuf *win; Evas_Engine_Info_GL_X11 *info; Evas *evas; 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 2ae3757f44..42d346aedb 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 ; #endif #define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_X11_log_dom, __VA_ARGS__) -typedef struct _Evas_GL_X11_Window Evas_GL_X11_Window; +typedef struct _Outbuf Outbuf; typedef struct _Evas_GL_X11_Context Evas_GL_X11_Context; -struct _Evas_GL_X11_Window +struct _Outbuf { Display *disp; Window win; @@ -106,20 +106,20 @@ struct _Evas_GL_X11_Context #endif }; -Evas_GL_X11_Window *eng_window_new(Display *disp, Window win, int screen, +Outbuf *eng_window_new(Display *disp, Window win, int screen, Visual *vis, Colormap cmap, int depth, int w, int h, int indirect, 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); -void eng_window_resurf(Evas_GL_X11_Window *gw); +void eng_window_free(Outbuf *gw); +void eng_window_use(Outbuf *gw); +void eng_window_unsurf(Outbuf *gw); +void eng_window_resurf(Outbuf *gw); void *eng_best_visual_get(Evas_Engine_Info_GL_X11 *einfo); Colormap eng_best_colormap_get(Evas_Engine_Info_GL_X11 *einfo); int eng_best_depth_get(Evas_Engine_Info_GL_X11 *einfo); -Evas_GL_X11_Context *eng_gl_context_new(Evas_GL_X11_Window *win); +Evas_GL_X11_Context *eng_gl_context_new(Outbuf *win); void eng_gl_context_free(Evas_GL_X11_Context *context); void eng_gl_context_use(Evas_GL_X11_Context *context); 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 92fe2d0286..b3dc5f5537 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 @@ #include "evas_engine.h" -static Evas_GL_X11_Window *_evas_gl_x11_window = NULL; +static Outbuf *_evas_gl_x11_window = NULL; #ifdef GL_GLES static EGLContext context = EGL_NO_CONTEXT; @@ -22,7 +22,7 @@ static Colormap _evas_gl_x11_rgba_cmap = 0; static int win_count = 0; -Evas_GL_X11_Window * +Outbuf * eng_window_new(Display *disp, Window win, int screen, @@ -35,7 +35,7 @@ eng_window_new(Display *disp, int alpha, int rot) { - Evas_GL_X11_Window *gw; + Outbuf *gw; #ifdef GL_GLES int context_attrs[3]; int config_attrs[40]; @@ -48,7 +48,7 @@ eng_window_new(Display *disp, if (!_evas_gl_x11_vi) return NULL; - gw = calloc(1, sizeof(Evas_GL_X11_Window)); + gw = calloc(1, sizeof(Outbuf)); if (!gw) return NULL; win_count++; @@ -416,7 +416,7 @@ eng_window_new(Display *disp, } void -eng_window_free(Evas_GL_X11_Window *gw) +eng_window_free(Outbuf *gw) { int ref = 0; win_count--; @@ -458,7 +458,7 @@ eng_window_free(Evas_GL_X11_Window *gw) static Eina_Bool eng_window_make_current(void *data, void *doit) { - Evas_GL_X11_Window *gw = data; + Outbuf *gw = data; #ifdef GL_GLES if (doit) @@ -501,7 +501,7 @@ eng_window_make_current(void *data, void *doit) } void -eng_window_use(Evas_GL_X11_Window *gw) +eng_window_use(Outbuf *gw) { Eina_Bool force_use = EINA_FALSE; @@ -565,7 +565,7 @@ eng_window_use(Evas_GL_X11_Window *gw) } void -eng_window_unsurf(Evas_GL_X11_Window *gw) +eng_window_unsurf(Outbuf *gw) { if (!gw->surf) return; if (!getenv("EVAS_GL_WIN_RESURF")) return; @@ -596,7 +596,7 @@ eng_window_unsurf(Evas_GL_X11_Window *gw) } void -eng_window_resurf(Evas_GL_X11_Window *gw) +eng_window_resurf(Outbuf *gw) { if (gw->surf) return; if (getenv("EVAS_GL_INFO")) @@ -851,7 +851,7 @@ eng_best_depth_get(Evas_Engine_Info_GL_X11 *einfo) } Evas_GL_X11_Context * -eng_gl_context_new(Evas_GL_X11_Window *win) +eng_gl_context_new(Outbuf *win) { Evas_GL_X11_Context *ctx; #if GL_GLES