diff options
author | Kenji Hosokawa <khosokawa@de.adit-jv.com> | 2017-11-20 10:52:55 +0100 |
---|---|---|
committer | Kenji Hosokawa <khosokawa@de.adit-jv.com> | 2017-11-24 11:13:50 +0100 |
commit | 903897c851382d8a7778cc2a843abe034aa0a5b2 (patch) | |
tree | f0c5ccf12c95612bd7376828d57037e0330e199d /weston-ivi-shell | |
parent | 2a577844efb0ee55f1a5ca8d0cbdc343789de292 (diff) | |
download | wayland-ivi-extension-903897c851382d8a7778cc2a843abe034aa0a5b2.tar.gz |
ivi-share: clean unused codes
Signed-off-by: Kenji Hosokawa <khosokawa@de.adit-jv.com>
Diffstat (limited to 'weston-ivi-shell')
-rw-r--r-- | weston-ivi-shell/src/ivi-share-gbm.c | 13 | ||||
-rw-r--r-- | weston-ivi-shell/src/ivi-share.c | 9 | ||||
-rw-r--r-- | weston-ivi-shell/src/ivi-share.h | 6 |
3 files changed, 9 insertions, 19 deletions
diff --git a/weston-ivi-shell/src/ivi-share-gbm.c b/weston-ivi-shell/src/ivi-share-gbm.c index d9ebd05..84996da 100644 --- a/weston-ivi-shell/src/ivi-share-gbm.c +++ b/weston-ivi-shell/src/ivi-share-gbm.c @@ -33,8 +33,6 @@ #include "ivi-share-server-protocol.h" #include "ivi-share.h" -static uint32_t nativesurface_name; - /* copied from libinput-seat.h of weston-1.9.0 */ struct udev_input { struct libinput *libinput; @@ -92,16 +90,13 @@ struct drm_backend { }; uint32_t -get_buffer_name(struct weston_surface *surface, - struct ivi_shell_share_ext *shell_ext) +get_buffer_name(struct ivi_share_nativesurface *p_nativesurface) { - (void)surface; - return nativesurface_name; + return p_nativesurface->name; } uint32_t -update_buffer_nativesurface(struct ivi_share_nativesurface *p_nativesurface, - struct ivi_shell_share_ext *shell_ext) +update_buffer_nativesurface(struct ivi_share_nativesurface *p_nativesurface) { if (NULL == p_nativesurface || NULL == p_nativesurface->surface) { return IVI_SHAREBUFFER_NOT_AVAILABLE; @@ -140,8 +135,6 @@ update_buffer_nativesurface(struct ivi_share_nativesurface *p_nativesurface, uint32_t format = IVI_SHARE_SURFACE_FORMAT_ARGB8888; uint32_t ret = IVI_SHAREBUFFER_STABLE; - nativesurface_name = name; - if (name != p_nativesurface->name) { ret |= IVI_SHAREBUFFER_DAMAGE; } diff --git a/weston-ivi-shell/src/ivi-share.c b/weston-ivi-shell/src/ivi-share.c index ddbf44a..21d8854 100644 --- a/weston-ivi-shell/src/ivi-share.c +++ b/weston-ivi-shell/src/ivi-share.c @@ -593,8 +593,7 @@ bind_share_interface(struct wl_client *p_client, void *p_data, } static void -send_to_client(struct ivi_share_nativesurface *p_nativesurface, uint32_t send_flag, - struct ivi_shell_share_ext *shell_ext) +send_to_client(struct ivi_share_nativesurface *p_nativesurface, uint32_t send_flag) { struct ivi_share_nativesurface_client_link *p_link = NULL; @@ -621,7 +620,7 @@ send_to_client(struct ivi_share_nativesurface *p_nativesurface, uint32_t send_fl } if ((IVI_SHAREBUFFER_DAMAGE & send_flag) == IVI_SHAREBUFFER_DAMAGE) { send_damage(p_link->resource, p_nativesurface->id, - get_buffer_name(p_nativesurface->surface, shell_ext)); + get_buffer_name(p_nativesurface)); } } } @@ -652,8 +651,8 @@ send_nativesurface_event(struct wl_listener *listener, void *data) continue; } - p_nativesurface->send_flag = update_buffer_nativesurface(p_nativesurface, shell_ext); - send_to_client(p_nativesurface, p_nativesurface->send_flag, shell_ext); + p_nativesurface->send_flag = update_buffer_nativesurface(p_nativesurface); + send_to_client(p_nativesurface, p_nativesurface->send_flag); } } diff --git a/weston-ivi-shell/src/ivi-share.h b/weston-ivi-shell/src/ivi-share.h index b1322b5..76105f5 100644 --- a/weston-ivi-shell/src/ivi-share.h +++ b/weston-ivi-shell/src/ivi-share.h @@ -69,7 +69,5 @@ enum ivi_sharebuffer_updatetype int32_t setup_buffer_sharing(struct weston_compositor *wc, const struct ivi_layout_interface *interface); -uint32_t get_buffer_name(struct weston_surface *surface, - struct ivi_shell_share_ext *shell_ext); -uint32_t update_buffer_nativesurface(struct ivi_share_nativesurface *nativesurface, - struct ivi_shell_share_ext *shell_ext); +uint32_t get_buffer_name(struct ivi_share_nativesurface *p_nativesurface); +uint32_t update_buffer_nativesurface(struct ivi_share_nativesurface *p_nativesurface); |