From dd95f864b622ca58bb8cd1e7bdcb6bd11acae886 Mon Sep 17 00:00:00 2001 From: Boram Park Date: Fri, 21 Jul 2017 10:00:13 +0900 Subject: [PATCH] Revert "ecore_evas_wl: do set_buffer_transform in gl side" This reverts commit 787f71a5a41378a2f63904df61ae5b6f6b148e1e. Change-Id: Ib37923559fa70865f48ffd08a91e584fc39dbfd7 --- .../ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 3 +-- src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h | 2 -- src/modules/evas/engines/wayland_egl/evas_wl_main.c | 9 --------- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c index 1e661b1..50e3cc4 100755 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c @@ -104,8 +104,7 @@ _ecore_evas_wl_common_engine_info_rotation_set(Ecore_Evas *ee, Evas_Engine_Info #ifdef BUILD_ECORE_EVAS_WAYLAND_EGL Evas_Engine_Info_Wayland_Egl *einfo = (Evas_Engine_Info_Wayland_Egl *)info; einfo->info.rotation = (ee->rotation + wdata->output_rotation) % 360; - /* the buffer transform information will be set in side of gl when rendering finish */ - einfo->window_rotation = ee->rotation; + ecore_wl_window_buffer_transform_set(wdata->win, wdata->output_rotation / 90); WRN("evas engine rotate: %d", einfo->info.rotation); #endif } diff --git a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h index 6767e1c..588e636 100644 --- a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h +++ b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h @@ -50,8 +50,6 @@ struct _Evas_Engine_Info_Wayland_Egl int depth_bits; int stencil_bits; int msaa_bits; - - int window_rotation; }; #endif diff --git a/src/modules/evas/engines/wayland_egl/evas_wl_main.c b/src/modules/evas/engines/wayland_egl/evas_wl_main.c index e9a9687..ec2c46a 100644 --- a/src/modules/evas/engines/wayland_egl/evas_wl_main.c +++ b/src/modules/evas/engines/wayland_egl/evas_wl_main.c @@ -561,15 +561,6 @@ eng_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth EIN dy = ah - h; } - /* buffer_transform: screen rotation + window rotation - * window_transform: window rotation only - * We have to let the display server know the window rotation value - * because the display server needs to calcuate the screen rotation value - * from buffer_transform value. - */ - wl_egl_window_set_buffer_transform(ob->win, ob->info->info.rotation / 90); - wl_egl_window_set_window_transform(ob->win, ob->info->window_rotation / 90); - if ((ob->info->info.rotation == 90) || (ob->info->info.rotation == 270)) wl_egl_window_resize(ob->win, h, w, dx, dy); else -- 2.7.4