devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=31a7963196cf82be7a49dc4d914e345961dcd5c3
commit 31a7963196cf82be7a49dc4d914e345961dcd5c3 Author: Chris Michael <[email protected]> Date: Mon Nov 6 09:19:20 2017 -0500 evas-software-x11: Remove need for useless free_region function Signed-off-by: Chris Michael <[email protected]> --- src/modules/evas/engines/software_x11/evas_engine.c | 4 ++-- src/modules/evas/engines/software_x11/evas_xlib_outbuf.c | 6 ------ src/modules/evas/engines/software_x11/evas_xlib_outbuf.h | 3 --- src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c | 6 ------ src/modules/evas/engines/software_x11/evas_xlib_swapbuf.h | 2 -- 5 files changed, 2 insertions(+), 19 deletions(-) diff --git a/src/modules/evas/engines/software_x11/evas_engine.c b/src/modules/evas/engines/software_x11/evas_engine.c index 49f3683757..fcef81466d 100644 --- a/src/modules/evas/engines/software_x11/evas_engine.c +++ b/src/modules/evas/engines/software_x11/evas_engine.c @@ -103,7 +103,7 @@ _output_xlib_setup(void *engine, int w, int h, int rot, Display *disp, Drawable NULL, evas_software_xlib_outbuf_new_region_for_update, evas_software_xlib_outbuf_push_updated_region, - evas_software_xlib_outbuf_free_region_for_update, + NULL, evas_software_xlib_outbuf_idle_flush, evas_software_xlib_outbuf_flush, NULL, @@ -152,7 +152,7 @@ _output_swapbuf_setup(void *engine, int w, int h, int rot, Display *disp, Drawab NULL, evas_software_xlib_swapbuf_new_region_for_update, evas_software_xlib_swapbuf_push_updated_region, - evas_software_xlib_swapbuf_free_region_for_update, + NULL, evas_software_xlib_swapbuf_idle_flush, evas_software_xlib_swapbuf_flush, NULL, diff --git a/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c b/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c index e52b6093d8..e390ca9da3 100644 --- a/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c +++ b/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c @@ -758,12 +758,6 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w } void -evas_software_xlib_outbuf_free_region_for_update(Outbuf *buf EINA_UNUSED, RGBA_Image *update EINA_UNUSED) -{ - /* no need to do anything - they are cleaned up on flush */ -} - -void evas_software_xlib_outbuf_flush(Outbuf *buf, Tilebuf_Rect *surface_damage EINA_UNUSED, Tilebuf_Rect *buffer_damage EINA_UNUSED, Evas_Render_Mode render_mode EINA_UNUSED) { Eina_List *l; diff --git a/src/modules/evas/engines/software_x11/evas_xlib_outbuf.h b/src/modules/evas/engines/software_x11/evas_xlib_outbuf.h index 8f4ddd2948..5829b7451f 100644 --- a/src/modules/evas/engines/software_x11/evas_xlib_outbuf.h +++ b/src/modules/evas/engines/software_x11/evas_xlib_outbuf.h @@ -35,9 +35,6 @@ void *evas_software_xlib_outbuf_new_region_for_update (Outbuf *buf, int *cw, int *ch); -void evas_software_xlib_outbuf_free_region_for_update (Outbuf *buf, - RGBA_Image *update); - void evas_software_xlib_outbuf_flush (Outbuf *buf, Tilebuf_Rect *surface_damage, Tilebuf_Rect *buffer_damage, Evas_Render_Mode render_mode); void evas_software_xlib_outbuf_idle_flush (Outbuf *buf); diff --git a/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c b/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c index 473045cdfd..9b04a949d6 100644 --- a/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c +++ b/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c @@ -318,12 +318,6 @@ evas_software_xlib_swapbuf_new_region_for_update(Outbuf *buf, int x, int y, int } void -evas_software_xlib_swapbuf_free_region_for_update(Outbuf *buf EINA_UNUSED, RGBA_Image *update EINA_UNUSED) -{ - /* no need to do anything - they are cleaned up on flush */ -} - -void evas_software_xlib_swapbuf_flush(Outbuf *buf, Tilebuf_Rect *surface_damage EINA_UNUSED, Tilebuf_Rect *buffer_damage EINA_UNUSED, Evas_Render_Mode render_mode) { if (render_mode == EVAS_RENDER_MODE_ASYNC_INIT) return; diff --git a/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.h b/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.h index 34325ea145..e8351a79c2 100644 --- a/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.h +++ b/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.h @@ -30,8 +30,6 @@ void *evas_software_xlib_swapbuf_new_region_for_update(Outbuf *buf, int *cy, int *cw, int *ch); -void evas_software_xlib_swapbuf_free_region_for_update(Outbuf *buf, - RGBA_Image *update); void evas_software_xlib_swapbuf_flush(Outbuf *buf, Tilebuf_Rect *surface_damage, Tilebuf_Rect *buffer_damage, Evas_Render_Mode render_mode); void evas_software_xlib_swapbuf_idle_flush(Outbuf *buf); void evas_software_xlib_swapbuf_push_updated_region(Outbuf *buf, --
