From a804797e0e3fd474742744f867080c45b9708b19 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Thu, 18 Jul 2019 12:27:40 +0900 Subject: [PATCH] e_hwc_windows: use hwc->ee instead of comp->ee Change-Id: Ia550a88cd56d6a767bdb6ef90a8836076f87d76a --- src/bin/e_hwc_window_queue.c | 8 +------- src/bin/e_hwc_windows.c | 12 +++++++----- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/bin/e_hwc_window_queue.c b/src/bin/e_hwc_window_queue.c index 1b6bda2..64f1442 100644 --- a/src/bin/e_hwc_window_queue.c +++ b/src/bin/e_hwc_window_queue.c @@ -251,19 +251,13 @@ _comp_wl_backup_buffer_get(tbm_surface_h tsurface) } static tbm_surface_queue_h -_get_tbm_surface_queue() -{ - return e_comp->e_comp_screen->tqueue; -} - -static tbm_surface_queue_h _e_hwc_window_queue_tqueue_acquire(E_Hwc_Window *hwc_window) { tdm_error error = TDM_ERROR_NONE; tbm_surface_queue_h tqueue; if (e_hwc_window_is_target(hwc_window)) - tqueue = _get_tbm_surface_queue(); + tqueue = e_hwc_tbm_surface_queue_get(hwc_window->hwc); else { tqueue = tdm_hwc_window_acquire_buffer_queue(hwc_window->thwc_window, &error); diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c index d44625b..27bf00c 100644 --- a/src/bin/e_hwc_windows.c +++ b/src/bin/e_hwc_windows.c @@ -708,10 +708,10 @@ _e_hwc_windows_target_window_new(E_Hwc *hwc) Evas *evas = NULL; E_Hwc_Window_Queue *queue = NULL; - name = ecore_evas_engine_name_get(e_comp->ee); + name = ecore_evas_engine_name_get(hwc->ee); EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL); - evas = ecore_evas_get(e_comp->ee); + evas = ecore_evas_get(hwc->ee); EINA_SAFETY_ON_NULL_RETURN_VAL(evas, NULL); if(!strcmp("gl_drm_tbm", name) || @@ -720,7 +720,7 @@ _e_hwc_windows_target_window_new(E_Hwc *hwc) !strcmp("software_tbm", name) || !strcmp("gl_tbm_ES", name)) { - ecore_evas_manual_render_set(e_comp->ee, 1); + ecore_evas_manual_render_set(hwc->ee, 1); } target_hwc_window = E_OBJECT_ALLOC(E_Hwc_Window_Target, E_HWC_WINDOW_TYPE, _e_hwc_windows_target_window_free); @@ -731,7 +731,7 @@ _e_hwc_windows_target_window_new(E_Hwc *hwc) ((E_Hwc_Window *)target_hwc_window)->accepted_state = E_HWC_WINDOW_STATE_DEVICE; ((E_Hwc_Window *)target_hwc_window)->hwc = hwc; - target_hwc_window->ee = e_comp->ee; + target_hwc_window->ee = hwc->ee; target_hwc_window->evas = ecore_evas_get(target_hwc_window->ee); target_hwc_window->event_fd = eventfd(0, EFD_NONBLOCK); target_hwc_window->event_hdlr = @@ -770,7 +770,9 @@ _e_hwc_windows_target_window_new(E_Hwc *hwc) return target_hwc_window; fail: - ecore_evas_manual_render_set(e_comp->ee, 0); + ecore_evas_manual_render_set(hwc->ee, 0); + if (target_hwc_window) + e_object_del(E_OBJECT(hwc->target_hwc_window)); return NULL; } -- 2.7.4