From 7e15e58e07a3323b6c883637c53f61f94903b5b3 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Wed, 8 Apr 2015 13:59:24 -0400 Subject: [PATCH] evas-drm: Cleanup drm engine code Summary: With the evas drm engine refactor, some of the fields in the Render_Engine structure are unused so remove them. @fix Signed-off-by: Chris Michael --- src/modules/evas/engines/drm/evas_engine.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/modules/evas/engines/drm/evas_engine.c b/src/modules/evas/engines/drm/evas_engine.c index 2a7bbfe..40365a9 100644 --- a/src/modules/evas/engines/drm/evas_engine.c +++ b/src/modules/evas/engines/drm/evas_engine.c @@ -6,8 +6,6 @@ typedef struct _Render_Engine Render_Engine; struct _Render_Engine { Render_Engine_Software_Generic generic; - - Evas_Engine_Info_Drm *info; }; /* function tables - filled in later (func and parent func) */ @@ -33,7 +31,7 @@ _output_setup(Evas_Engine_Info_Drm *info, int w, int h) if (!evas_render_engine_software_generic_init(&re->generic, ob, evas_outbuf_buffer_state_get, - evas_outbuf_get_rot, + evas_outbuf_rot_get, evas_outbuf_reconfigure, NULL, evas_outbuf_update_region_new, evas_outbuf_update_region_push, @@ -93,12 +91,6 @@ eng_setup(Evas *evas, void *einfo) /* try to get the evas public data */ if (!(epd = eo_data_scope_get(evas, EVAS_CANVAS_CLASS))) return 0; - /* set canvas reference - * - * NB: We do this here so that on a vt switch, we can disable - * rendering (or re-enable) for this canvas */ - info->info.evas = evas; - /* check for valid engine output */ if (!(re = epd->engine.data.output)) { @@ -123,9 +115,6 @@ eng_setup(Evas *evas, void *einfo) ob->w, ob->h); } - /* update the info structure pointer */ - re->info = info; - /* reassign engine output */ epd->engine.data.output = re; if (!epd->engine.data.output) return 0; @@ -144,10 +133,13 @@ eng_setup(Evas *evas, void *einfo) static void eng_output_free(void *data) { - Render_Engine *re = data; + Render_Engine *re; - evas_render_engine_software_generic_clean(&re->generic); - free(re); + if ((re = data)) + { + evas_render_engine_software_generic_clean(&re->generic); + free(re); + } evas_common_shutdown(); } -- 2.7.4