From dd71a9fe47f3091e352de1b21330b35be4152efa Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 1 Mar 2017 15:32:47 +0100 Subject: Remove forward port for weston * The forward port on weston is now merged in weston upstream * fix the patch 0001-weston-patch-for-wl-shell-emulator.patch for weston 1.11 patch -> commit id from upstream 0001-ivi-shell-fix-TODO-which-expects-only-one-screen-in-.patch b216c92d4d19d4b88817d088038de90f3d95ec06 0002-ivi-shell-avoid-inserting-a-ivi_layer-to-multiple-sc.patch 77b0ee18a2e02e6084ece3d04914f7e8f4c6dcb9 0003-ivi-shell-fix-layout_layer.view_list-is-not-initiliz.patch fbfa8f21f91dfd1a1d85f9c6b039fe893a36e69b 0004-ivi-shell-remove-a-code-which-expects-only-a-screen-.patch 747c3865ab7bf8defc7a0cacf148b547c949f303 0005-ivi-shell-multi-screen-support.-ivi_layout_screen-to.patch b4cb25dc261375bad87d1c1dd058b9716009e6fb 0006-ivi-shell-transforming-from-a-single-screen-coordina.patch 29babdf099fee228883ab6425811f11135296274 0007-RFR-ivi-shell-multi-screen-support-to-calcuration-of.patch 1c2618e9ff58d355714bcdde61f87a6e918f3059 Bug-AGL: SPEC-411 Change-Id: I58a23f3fe4046ef2befb594bf0f76f34c4d15312 Signed-off-by: Ronan Le Martret --- ...ransforming-from-a-single-screen-coordina.patch | 61 ---------------------- 1 file changed, 61 deletions(-) delete mode 100644 recipes-graphics/wayland/weston/0006-ivi-shell-transforming-from-a-single-screen-coordina.patch (limited to 'recipes-graphics/wayland/weston/0006-ivi-shell-transforming-from-a-single-screen-coordina.patch') diff --git a/recipes-graphics/wayland/weston/0006-ivi-shell-transforming-from-a-single-screen-coordina.patch b/recipes-graphics/wayland/weston/0006-ivi-shell-transforming-from-a-single-screen-coordina.patch deleted file mode 100644 index 0ae758ac..00000000 --- a/recipes-graphics/wayland/weston/0006-ivi-shell-transforming-from-a-single-screen-coordina.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 2a3b8a213d5076aa6f051e88858b65ebfc53f64a Mon Sep 17 00:00:00 2001 -From: Nobuhiko Tanibata -Date: Mon, 30 Nov 2015 15:08:32 +0900 -Subject: [PATCH] ivi-shell: transforming from a single screen coordinates to - multi screen coordinates: global coordinates. - -In single screen, the coordinates of layer local coordinates are the -same as global coordinates. However, to support multi screens, the -layer-local coordinates shall be transformed to multi screen coordinates, -which is global coordinates. The abosolute coordinates of a screen in global -stored in (x,y) of output of its weston output so it shall be used to -transform layer-local to global coordinates. - -Signed-off-by: Nobuhiko Tanibata ---- - ivi-shell/ivi-layout.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c -index 1773af8..65c2735 100644 ---- a/ivi-shell/ivi-layout.c -+++ b/ivi-shell/ivi-layout.c -@@ -679,6 +679,7 @@ calc_inverse_matrix_transform(const struct weston_matrix *matrix, - */ - static void - calc_surface_to_global_matrix_and_mask_to_weston_surface( -+ struct ivi_layout_screen *iviscrn, - struct ivi_layout_layer *ivilayer, - struct ivi_layout_surface *ivisurf, - struct weston_matrix *m, -@@ -686,6 +687,7 @@ calc_surface_to_global_matrix_and_mask_to_weston_surface( - { - const struct ivi_layout_surface_properties *sp = &ivisurf->prop; - const struct ivi_layout_layer_properties *lp = &ivilayer->prop; -+ struct weston_output *output = iviscrn->output; - struct ivi_rectangle weston_surface_rect = { 0, - 0, - ivisurf->surface->width, -@@ -713,7 +715,9 @@ calc_surface_to_global_matrix_and_mask_to_weston_surface( - * coordinates to global coordinates, which is computed by - * two steps, - * - surface-local coordinates to layer-local coordinates -- * - layer-local coordinates to global coordinates -+ * - layer-local coordinates to a single screen-local coordinates -+ * - a single screen-local coordinates to multi screen coordinates, -+ * which is global coordinates. - */ - calc_transformation_matrix(&surface_source_rect, - &surface_dest_rect, -@@ -723,6 +727,8 @@ calc_surface_to_global_matrix_and_mask_to_weston_surface( - &layer_dest_rect, - lp->orientation, m); - -+ weston_matrix_translate(m, output->x, output->y, 0.0f); -+ - /* this intersected ivi_rectangle would be used for masking - * weston_surface - */ --- -2.7.4 - -- cgit 1.2.3-korg