From: SooChan Lim Date: Wed, 11 Nov 2020 00:45:03 +0000 (+0900) Subject: e_hwc_window: use e_client_cdata_get X-Git-Tag: submit/tizen/20201111.090326~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F73%2F247473%2F3;p=platform%2Fupstream%2Fenlightenment.git e_hwc_window: use e_client_cdata_get Change-Id: Ied0741907dee35971aa3072c6c1253daf3bb5eb0 --- diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c index dc28fefc4c..565f559ba3 100644 --- a/src/bin/e_hwc_window.c +++ b/src/bin/e_hwc_window.c @@ -148,11 +148,11 @@ static E_Comp_Wl_Buffer * _e_hwc_window_comp_wl_buffer_get(E_Hwc_Window *hwc_window) { E_Client *ec = hwc_window->ec; - E_Comp_Wl_Client_Data *cdata = NULL; + E_Comp_Wl_Client_Data *cdata; if (!ec) return NULL; - cdata = ec->comp_data; + cdata = e_client_cdata_get(ec); if (!cdata) return NULL; return cdata->buffer_ref.buffer; @@ -164,13 +164,13 @@ _get_wayland_tbm_client_queue(E_Client *ec) struct wayland_tbm_client_queue * cqueue = NULL; struct wl_resource *wl_surface = NULL; E_Comp_Wl_Data *wl_cdata = (E_Comp_Wl_Data *)e_comp->wl_comp_data; - E_Comp_Wl_Client_Data *cdata = NULL; + E_Comp_Wl_Client_Data *cdata; EINA_SAFETY_ON_NULL_RETURN_VAL(wl_cdata, NULL); if (!ec) return NULL; - cdata = (E_Comp_Wl_Client_Data *)e_pixmap_cdata_get(ec->pixmap); + cdata = e_pixmap_cdata_get(ec->pixmap); EINA_SAFETY_ON_NULL_RETURN_VAL(cdata, NULL); wl_surface = cdata->wl_surface; @@ -565,7 +565,8 @@ _e_hwc_window_cursor_image_update(E_Hwc_Window *hwc_window) } else { - EHWERR("unkown buffer type:%d", NULL, hwc_window->hwc, hwc_window, ec->comp_data->buffer_ref.buffer->type); + E_Comp_Wl_Client_Data *cdata = e_client_cdata_get(ec); + EHWERR("unkown buffer type:%d", NULL, hwc_window->hwc, hwc_window, cdata->buffer_ref.buffer->type); return EINA_FALSE; } @@ -1832,7 +1833,7 @@ EINTERN Eina_Bool e_hwc_window_device_state_available_update(E_Hwc_Window *hwc_window) { E_Client *ec = NULL; - E_Comp_Wl_Client_Data *cdata = NULL; + E_Comp_Wl_Client_Data *cdata; E_Pixmap *pixmap = NULL; E_Output *eout = NULL; int minw = 0, minh = 0; @@ -1874,7 +1875,7 @@ e_hwc_window_device_state_available_update(E_Hwc_Window *hwc_window) goto finish; } - cdata = (E_Comp_Wl_Client_Data*)ec->comp_data; + cdata = e_client_cdata_get(ec); if ((!cdata) || (!cdata->buffer_ref.buffer)) { restriction = E_HWC_WINDOW_RESTRICTION_BUFFER; @@ -2131,7 +2132,7 @@ _e_hwc_window_client_recover(E_Hwc_Window *hwc_window, Eina_Bool *clear_attach) e_hwc_window_name_get(hwc_window)); /* force update */ - if (ec->comp_data) + if (e_client_cdata_get(ec)) e_comp_wl_surface_attach(ec, recover_buffer); else { @@ -2192,7 +2193,7 @@ _e_hwc_window_rendered_window_set(E_Hwc_Window *hwc_window, Eina_Bool set) hwc_window->ec, hwc_window->hwc, hwc_window, e_hwc_window_name_get(hwc_window)); } - if (clear_attach && ec->comp_data) + if (clear_attach && e_client_cdata_get(ec)) e_comp_wl_surface_attach(ec, NULL); } else