diff options
| author | Simon Ser <contact@emersion.fr> | 2022-11-30 13:25:56 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2022-11-30 14:19:46 +0100 |
| commit | 9c04fd2496480d2c2052738f744dae403578ca58 (patch) | |
| tree | babf31e6d37bae79da4288c9cf7557749fe51ad3 | |
| parent | 88493d1f7cb10350c95c264fc7f6bfc7676073de (diff) | |
linux-dmabuf-v1: drop wlr_renderer field
This isn't used anymore.
| -rw-r--r-- | include/wlr/types/wlr_linux_dmabuf_v1.h | 2 | ||||
| -rw-r--r-- | types/wlr_linux_dmabuf_v1.c | 11 |
2 files changed, 0 insertions, 13 deletions
diff --git a/include/wlr/types/wlr_linux_dmabuf_v1.h b/include/wlr/types/wlr_linux_dmabuf_v1.h index 93413f72..e56c904a 100644 --- a/include/wlr/types/wlr_linux_dmabuf_v1.h +++ b/include/wlr/types/wlr_linux_dmabuf_v1.h @@ -57,7 +57,6 @@ struct wlr_linux_dmabuf_feedback_v1_tranche { /* the protocol interface */ struct wlr_linux_dmabuf_v1 { struct wl_global *global; - struct wlr_renderer *renderer; struct { struct wl_signal destroy; @@ -72,7 +71,6 @@ struct wlr_linux_dmabuf_v1 { int main_device_fd; // to sanity check FDs sent by clients struct wl_listener display_destroy; - struct wl_listener renderer_destroy; }; /** diff --git a/types/wlr_linux_dmabuf_v1.c b/types/wlr_linux_dmabuf_v1.c index f4d5a0fd..739b2f96 100644 --- a/types/wlr_linux_dmabuf_v1.c +++ b/types/wlr_linux_dmabuf_v1.c @@ -893,7 +893,6 @@ static void linux_dmabuf_v1_destroy(struct wlr_linux_dmabuf_v1 *linux_dmabuf) { close(linux_dmabuf->main_device_fd); wl_list_remove(&linux_dmabuf->display_destroy.link); - wl_list_remove(&linux_dmabuf->renderer_destroy.link); wl_global_destroy(linux_dmabuf->global); free(linux_dmabuf); @@ -905,12 +904,6 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) { linux_dmabuf_v1_destroy(linux_dmabuf); } -static void handle_renderer_destroy(struct wl_listener *listener, void *data) { - struct wlr_linux_dmabuf_v1 *linux_dmabuf = - wl_container_of(listener, linux_dmabuf, renderer_destroy); - linux_dmabuf_v1_destroy(linux_dmabuf); -} - static bool set_default_feedback(struct wlr_linux_dmabuf_v1 *linux_dmabuf, const struct wlr_linux_dmabuf_feedback_v1 *feedback) { struct wlr_linux_dmabuf_feedback_v1_compiled *compiled = feedback_compile(feedback); @@ -985,7 +978,6 @@ struct wlr_linux_dmabuf_v1 *wlr_linux_dmabuf_v1_create_with_renderer(struct wl_d wlr_log(WLR_ERROR, "could not create simple dmabuf manager"); return NULL; } - linux_dmabuf->renderer = renderer; linux_dmabuf->main_device_fd = -1; wl_list_init(&linux_dmabuf->surfaces); @@ -1014,9 +1006,6 @@ struct wlr_linux_dmabuf_v1 *wlr_linux_dmabuf_v1_create_with_renderer(struct wl_d linux_dmabuf->display_destroy.notify = handle_display_destroy; wl_display_add_destroy_listener(display, &linux_dmabuf->display_destroy); - linux_dmabuf->renderer_destroy.notify = handle_renderer_destroy; - wl_signal_add(&renderer->events.destroy, &linux_dmabuf->renderer_destroy); - wlr_buffer_register_resource_interface(&buffer_resource_interface); return linux_dmabuf; |