diff options
| author | Ucan, Emre (ADITG/SW1) <eucan@de.adit-jv.com> | 2016-03-17 15:30:42 +0000 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2016-03-24 11:10:07 +0200 |
| commit | 273874e3c715a7102add0030f200d0a0f17628fa (patch) | |
| tree | 3d2d8dad72f66bf9dfa6296a35d6d565252e6a90 /tests | |
| parent | 3a8521e0056d44602106ac7bbe38dab2c4a8a3ed (diff) | |
| download | weston-273874e3c715a7102add0030f200d0a0f17628fa.tar.gz | |
ivi-shell: use weston_output in public APIs
IVI layout APIs now are called with weston_output pointers,
instead of ivi_layout_screen pointers.
Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Acked-by: Wataru Natsume <wnatsume@jp.adit-jv.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ivi_layout-internal-test.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/ivi_layout-internal-test.c b/tests/ivi_layout-internal-test.c index 2dfe486a..99d10a4f 100644 --- a/tests/ivi_layout-internal-test.c +++ b/tests/ivi_layout-internal-test.c @@ -548,7 +548,7 @@ test_screen_render_order(struct test_context *ctx) { #define LAYER_NUM (3) const struct ivi_layout_interface *lyt = ctx->layout_interface; - struct ivi_layout_screen *iviscrn; + struct weston_output *output; struct ivi_layout_layer *ivilayers[LAYER_NUM] = {}; struct ivi_layout_layer **array; int32_t length = 0; @@ -557,16 +557,16 @@ test_screen_render_order(struct test_context *ctx) if (wl_list_empty(&ctx->compositor->output_list)) return; - iviscrn = lyt->get_screen_from_id(0); + output = wl_container_of(ctx->compositor->output_list.next, output, link); for (i = 0; i < LAYER_NUM; i++) ivilayers[i] = lyt->layer_create_with_dimension(IVI_TEST_LAYER_ID(i), 200, 300); - iassert(lyt->screen_set_render_order(iviscrn, ivilayers, LAYER_NUM) == IVI_SUCCEEDED); + iassert(lyt->screen_set_render_order(output, ivilayers, LAYER_NUM) == IVI_SUCCEEDED); lyt->commit_changes(); - iassert(lyt->get_layers_on_screen(iviscrn, &length, &array) == IVI_SUCCEEDED); + iassert(lyt->get_layers_on_screen(output, &length, &array) == IVI_SUCCEEDED); iassert(length == LAYER_NUM); for (i = 0; i < LAYER_NUM; i++) iassert(array[i] == ivilayers[i]); @@ -576,11 +576,11 @@ test_screen_render_order(struct test_context *ctx) array = NULL; - iassert(lyt->screen_set_render_order(iviscrn, NULL, 0) == IVI_SUCCEEDED); + iassert(lyt->screen_set_render_order(output, NULL, 0) == IVI_SUCCEEDED); lyt->commit_changes(); - iassert(lyt->get_layers_on_screen(iviscrn, &length, &array) == IVI_SUCCEEDED); + iassert(lyt->get_layers_on_screen(output, &length, &array) == IVI_SUCCEEDED); iassert(length == 0 && array == NULL); for (i = 0; i < LAYER_NUM; i++) @@ -594,7 +594,7 @@ test_screen_bad_render_order(struct test_context *ctx) { #define LAYER_NUM (3) const struct ivi_layout_interface *lyt = ctx->layout_interface; - struct ivi_layout_screen *iviscrn; + struct weston_output *output; struct ivi_layout_layer *ivilayers[LAYER_NUM] = {}; struct ivi_layout_layer **array; int32_t length = 0; @@ -603,7 +603,7 @@ test_screen_bad_render_order(struct test_context *ctx) if (wl_list_empty(&ctx->compositor->output_list)) return; - iviscrn = lyt->get_screen_from_id(0); + output = wl_container_of(ctx->compositor->output_list.next, output, link); for (i = 0; i < LAYER_NUM; i++) ivilayers[i] = lyt->layer_create_with_dimension(IVI_TEST_LAYER_ID(i), 200, 300); @@ -613,8 +613,8 @@ test_screen_bad_render_order(struct test_context *ctx) lyt->commit_changes(); iassert(lyt->get_layers_on_screen(NULL, &length, &array) == IVI_FAILED); - iassert(lyt->get_layers_on_screen(iviscrn, NULL, &array) == IVI_FAILED); - iassert(lyt->get_layers_on_screen(iviscrn, &length, NULL) == IVI_FAILED); + iassert(lyt->get_layers_on_screen(output, NULL, &array) == IVI_FAILED); + iassert(lyt->get_layers_on_screen(output, &length, NULL) == IVI_FAILED); for (i = 0; i < LAYER_NUM; i++) lyt->layer_destroy(ivilayers[i]); @@ -628,19 +628,19 @@ test_commit_changes_after_render_order_set_layer_destroy( { #define LAYER_NUM (3) const struct ivi_layout_interface *lyt = ctx->layout_interface; - struct ivi_layout_screen *iviscrn; + struct weston_output *output; struct ivi_layout_layer *ivilayers[LAYER_NUM] = {}; uint32_t i; if (wl_list_empty(&ctx->compositor->output_list)) return; - iviscrn = lyt->get_screen_from_id(0); + output = wl_container_of(ctx->compositor->output_list.next, output, link); for (i = 0; i < LAYER_NUM; i++) ivilayers[i] = lyt->layer_create_with_dimension(IVI_TEST_LAYER_ID(i), 200, 300); - iassert(lyt->screen_set_render_order(iviscrn, ivilayers, LAYER_NUM) == IVI_SUCCEEDED); + iassert(lyt->screen_set_render_order(output, ivilayers, LAYER_NUM) == IVI_SUCCEEDED); lyt->layer_destroy(ivilayers[1]); |