[PATCH weston 3/5] ivi-shell: simplify ivi_layout_set_render_order

Ucan, Emre (ADITG/SW1) eucan at de.adit-jv.com
Wed Mar 16 13:37:05 UTC 2016


Signed-off-by: Emre Ucan <eucan at de.adit-jv.com>
---
 ivi-shell/ivi-layout.c |   19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index f9135eb..2782346 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -1895,10 +1895,6 @@ ivi_layout_layer_set_render_order(struct ivi_layout_layer *ivilayer,
 				  struct ivi_layout_surface **pSurface,
 				  int32_t number)
 {
-	struct ivi_layout *layout = get_instance();
-	struct ivi_layout_surface *ivisurf = NULL;
-	struct ivi_layout_surface *next = NULL;
-	uint32_t *id_surface = NULL;
 	int32_t i = 0;
 
 	if (ivilayer == NULL) {
@@ -1909,18 +1905,9 @@ ivi_layout_layer_set_render_order(struct ivi_layout_layer *ivilayer,
 	clear_surface_pending_list(ivilayer);
 
 	for (i = 0; i < number; i++) {
-		id_surface = &pSurface[i]->id_surface;
-
-		wl_list_for_each_safe(ivisurf, next, &layout->surface_list, link) {
-			if (*id_surface != ivisurf->id_surface) {
-				continue;
-			}
-
-			wl_list_remove(&ivisurf->pending.link);
-			wl_list_insert(&ivilayer->pending.surface_list,
-				       &ivisurf->pending.link);
-			break;
-		}
+		wl_list_remove(&pSurface[i]->pending.link);
+		wl_list_insert(&ivilayer->pending.surface_list,
+				&pSurface[i]->pending.link);
 	}
 
 	ivilayer->order.dirty = 1;
-- 
1.7.9.5



More information about the wayland-devel mailing list