raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=30207a61658509d810c508d5ee8b034c1aea451c
commit 30207a61658509d810c508d5ee8b034c1aea451c Author: Vincent Torri <[email protected]> Date: Mon Oct 25 10:08:57 2021 +0100 Evas: remove old xcb code in software_x11 code Summary: this backend code was for selecting XCB over Xlib. Now XCB is removed, this code is useless Reviewers: raster Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D12299 --- src/modules/ecore_evas/engines/x/ecore_evas_x.c | 2 -- .../software_x11/Evas_Engine_Software_X11.h | 13 +++------ .../evas/engines/software_x11/evas_engine.c | 31 +++++++--------------- 3 files changed, 12 insertions(+), 34 deletions(-) diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c b/src/modules/ecore_evas/engines/x/ecore_evas_x.c index d3382686e3..6b70c65d3e 100644 --- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c +++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c @@ -4921,7 +4921,6 @@ ecore_evas_software_x11_new_internal(const char *disp_name, Ecore_X_Window paren redraw_debug = 0; } - einfo->info.backend = EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB; einfo->info.connection = ecore_x_display_get(); einfo->info.screen = NULL; einfo->info.drawable = ee->prop.window; @@ -5120,7 +5119,6 @@ ecore_evas_software_x11_pixmap_new_internal(const char *disp_name, Ecore_X_Windo redraw_debug = 0; } - einfo->info.backend = EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB; einfo->info.connection = ecore_x_display_get(); einfo->info.screen = NULL; diff --git a/src/modules/evas/engines/software_x11/Evas_Engine_Software_X11.h b/src/modules/evas/engines/software_x11/Evas_Engine_Software_X11.h index dab373cd35..5ab24459e5 100644 --- a/src/modules/evas/engines/software_x11/Evas_Engine_Software_X11.h +++ b/src/modules/evas/engines/software_x11/Evas_Engine_Software_X11.h @@ -1,11 +1,6 @@ #ifndef _EVAS_ENGINE_SOFTWARE_X11_H # define _EVAS_ENGINE_SOFTWARE_X11_H -typedef enum -{ - EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB -} Evas_Engine_Info_Software_X11_Backend; - typedef struct _Evas_Engine_Info_Software_X11 Evas_Engine_Info_Software_X11; struct _Evas_Engine_Info_Software_X11 @@ -17,8 +12,6 @@ struct _Evas_Engine_Info_Software_X11 /* engine specific data & parameters it needs to set up */ struct { - Evas_Engine_Info_Software_X11_Backend backend; - void *connection, *screen; unsigned int drawable, mask; void *visual; @@ -37,9 +30,9 @@ struct _Evas_Engine_Info_Software_X11 /* engine specific function calls to query stuff about the destination */ struct { - void *(*best_visual_get) (int backend, void *connection, int screen); - unsigned int (*best_colormap_get) (int backend, void *connection, int screen); - int (*best_depth_get) (int backend, void *connection, int screen); + void *(*best_visual_get) (void *connection, int screen); + unsigned int (*best_colormap_get) (void *connection, int screen); + int (*best_depth_get) (void *connection, int screen); } func; unsigned char mask_changed : 1; diff --git a/src/modules/evas/engines/software_x11/evas_engine.c b/src/modules/evas/engines/software_x11/evas_engine.c index 211cd84fdd..5bcf91962e 100644 --- a/src/modules/evas/engines/software_x11/evas_engine.c +++ b/src/modules/evas/engines/software_x11/evas_engine.c @@ -45,9 +45,9 @@ struct _Render_Engine }; /* prototypes we will use here */ -static void *_best_visual_get(int backend, void *connection, int screen); -static unsigned int _best_colormap_get(int backend, void *connection, int screen); -static int _best_depth_get(int backend, void *connection, int screen); +static void *_best_visual_get(void *connection, int screen); +static unsigned int _best_colormap_get(void *connection, int screen); +static int _best_depth_get(void *connection, int screen); static Eina_List *_outbufs = NULL; @@ -165,34 +165,27 @@ on_error: } static void * -_best_visual_get(int backend, void *connection, int screen) +_best_visual_get(void *connection, int screen) { if (!connection) return NULL; - if (backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB) - return DefaultVisual((Display *)connection, screen); - - return NULL; + return DefaultVisual((Display *)connection, screen); } static unsigned int -_best_colormap_get(int backend, void *connection, int screen) +_best_colormap_get(void *connection, int screen) { if (!connection) return 0; - if (backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB) - return DefaultColormap((Display *)connection, screen); - return 0; + return DefaultColormap((Display *)connection, screen); } static int -_best_depth_get(int backend, void *connection, int screen) +_best_depth_get(void *connection, int screen) { if (!connection) return 0; - if (backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB) - return DefaultDepth((Display *)connection, screen); - return 0; + return DefaultDepth((Display *)connection, screen); } static void @@ -235,9 +228,6 @@ eng_output_setup(void *engine, void *in, unsigned int w, unsigned int h) static int try_swapbuf = -1; char *s; - if (info->info.backend != EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB) - return NULL; - if (try_swapbuf == -1) { if ((s = getenv("EVAS_NO_DRI_SWAPBUF")) != NULL) @@ -285,9 +275,6 @@ eng_output_update(void *engine EINA_UNUSED, void *data, void *in, unsigned int w Render_Engine *re = data; Outbuf *ob = NULL; - if (info->info.backend != EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB) - return 0; - _outbufs = eina_list_remove(_outbufs, re->generic.ob); if (re->generic.outbuf_free == evas_software_xlib_swapbuf_free) --
