From 0f352f437d175c11d47ea91a4c4817994f251db1 Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Tue, 29 Nov 2016 21:44:59 +0900 Subject: [PATCH] e_plane: clean up commit_data_release and remove unused function. - removed unused fuction and variable of renderer. (e_plane_renderer_pending_set and e_plane_renderer_pending_check) - clean up e_plane_commit_data_release function Change-Id: I3544d7fec8cfb0045c4b9e112c18db3312f64266 --- src/bin/e_plane.c | 17 +++++------------ src/bin/e_plane_renderer.c | 17 ----------------- src/bin/e_plane_renderer.h | 3 --- 3 files changed, 5 insertions(+), 32 deletions(-) diff --git a/src/bin/e_plane.c b/src/bin/e_plane.c index 8e161fe0f6..10313020b5 100644 --- a/src/bin/e_plane.c +++ b/src/bin/e_plane.c @@ -852,8 +852,6 @@ e_plane_commit_data_aquire(E_Plane *plane) /* set the update_exist to be false */ e_plane_renderer_update_exist_set(plane->renderer, EINA_FALSE); - /* set the pending to be true */ - e_plane_renderer_pending_set(plane->renderer, EINA_TRUE); plane->pending_commit_data = data; return data; @@ -871,8 +869,6 @@ e_plane_commit_data_aquire(E_Plane *plane) /* set the update_exist to be false */ e_plane_renderer_update_exist_set(plane->renderer, EINA_FALSE); - /* set the pending to be true */ - e_plane_renderer_pending_set(plane->renderer, EINA_TRUE); plane->pending_commit_data = data; /* send frame event enlightenment dosen't send frame evnet in nocomp */ @@ -914,7 +910,11 @@ e_plane_commit_data_release(E_Plane_Commit_Data *data) return; } - displaying_tsurface = e_plane_renderer_displaying_surface_get(renderer); + if (renderer) + { + displaying_tsurface = e_plane_renderer_displaying_surface_get(renderer); + e_plane_renderer_displaying_surface_set(renderer, tsurface); + } if (plane->is_fb && !ec) { @@ -949,8 +949,6 @@ e_plane_commit_data_release(E_Plane_Commit_Data *data) tbm_surface_internal_unref(plane->displaying_buffer_tsurface); plane->displaying_buffer_tsurface = NULL; } - - e_plane_renderer_displaying_surface_set(renderer, tsurface); } else { @@ -999,15 +997,10 @@ e_plane_commit_data_release(E_Plane_Commit_Data *data) tbm_surface_internal_ref(tsurface); plane->displaying_buffer_tsurface = tsurface; - e_plane_renderer_displaying_surface_set(renderer, tsurface); - e_comp_wl_buffer_reference(&data->buffer_ref, NULL); } - /* set the pending to be false */ - e_plane_renderer_pending_set(plane->renderer, EINA_FALSE); plane->pending_commit_data = NULL; - tbm_surface_internal_unref(tsurface); free(data); } diff --git a/src/bin/e_plane_renderer.c b/src/bin/e_plane_renderer.c index f681a90162..76c8717ac9 100644 --- a/src/bin/e_plane_renderer.c +++ b/src/bin/e_plane_renderer.c @@ -1129,23 +1129,6 @@ e_plane_renderer_update_exist_check(E_Plane_Renderer *renderer) return renderer->update_exist; } -EINTERN void -e_plane_renderer_pending_set(E_Plane_Renderer *renderer, Eina_Bool pending) -{ - EINA_SAFETY_ON_NULL_RETURN(renderer); - - if (renderer->pending != pending) - renderer->pending = pending; -} - -EINTERN Eina_Bool -e_plane_renderer_pending_check(E_Plane_Renderer *renderer) -{ - EINA_SAFETY_ON_NULL_RETURN_VAL(renderer, EINA_FALSE); - - return renderer->pending; -} - EINTERN E_Plane * e_plane_renderer_plane_get(E_Plane_Renderer *renderer) { diff --git a/src/bin/e_plane_renderer.h b/src/bin/e_plane_renderer.h index c52544a070..2709b763f0 100644 --- a/src/bin/e_plane_renderer.h +++ b/src/bin/e_plane_renderer.h @@ -40,7 +40,6 @@ struct _E_Plane_Renderer { Evas *evas; Eina_Bool update_ee; Eina_Bool update_exist; - Eina_Bool pending; E_Plane *plane; @@ -58,8 +57,6 @@ EINTERN Eina_Bool e_plane_renderer_deactivate(E_Plane_Renderer EINTERN E_Plane_Renderer_State e_plane_renderer_state_get(E_Plane_Renderer *renderer); EINTERN void e_plane_renderer_update_exist_set(E_Plane_Renderer *renderer, Eina_Bool update_exit); EINTERN Eina_Bool e_plane_renderer_update_exist_check(E_Plane_Renderer *renderer); -EINTERN void e_plane_renderer_pending_set(E_Plane_Renderer *renderer, Eina_Bool pending); -EINTERN Eina_Bool e_plane_renderer_pending_check(E_Plane_Renderer *renderer); EINTERN E_Plane *e_plane_renderer_plane_get(E_Plane_Renderer *renderer); EINTERN void e_plane_renderer_displaying_surface_set(E_Plane_Renderer *renderer, tbm_surface_h tsurface); EINTERN tbm_surface_h e_plane_renderer_displaying_surface_get(E_Plane_Renderer *renderer); -- 2.34.1