From 3d73b899ffdb6cdb45f69acfa5d7a914943dc592 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 22 Nov 2021 10:32:55 +0100 Subject: [PATCH] linux-dmabuf-v1: hide wlr_linux_buffer_params_v1 The parameters are used when the client is in the process of building a buffer. There's no reason why this internal implementation detail should be exposed in our public header. --- include/wlr/types/wlr_linux_dmabuf_v1.h | 11 ++++------- types/wlr_linux_dmabuf_v1.c | 7 +++++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/wlr/types/wlr_linux_dmabuf_v1.h b/include/wlr/types/wlr_linux_dmabuf_v1.h index a2db7fea..b4eb8675 100644 --- a/include/wlr/types/wlr_linux_dmabuf_v1.h +++ b/include/wlr/types/wlr_linux_dmabuf_v1.h @@ -20,6 +20,8 @@ struct wlr_dmabuf_v1_buffer { struct wl_resource *resource; // can be NULL if the client destroyed it struct wlr_dmabuf_attributes attributes; + // private state + struct wl_listener release; }; @@ -36,13 +38,6 @@ bool wlr_dmabuf_v1_resource_is_buffer(struct wl_resource *buffer_resource); struct wlr_dmabuf_v1_buffer *wlr_dmabuf_v1_buffer_from_buffer_resource( struct wl_resource *buffer_resource); -struct wlr_linux_buffer_params_v1 { - struct wl_resource *resource; - struct wlr_linux_dmabuf_v1 *linux_dmabuf; - struct wlr_dmabuf_attributes attributes; - bool has_modifier; -}; - /* the protocol interface */ struct wlr_linux_dmabuf_v1 { struct wl_global *global; @@ -52,6 +47,8 @@ struct wlr_linux_dmabuf_v1 { struct wl_signal destroy; } events; + // private state + 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 9b4cdd44..63b52023 100644 --- a/types/wlr_linux_dmabuf_v1.c +++ b/types/wlr_linux_dmabuf_v1.c @@ -13,6 +13,13 @@ #define LINUX_DMABUF_VERSION 3 +struct wlr_linux_buffer_params_v1 { + struct wl_resource *resource; + struct wlr_linux_dmabuf_v1 *linux_dmabuf; + struct wlr_dmabuf_attributes attributes; + bool has_modifier; +}; + static void buffer_handle_destroy(struct wl_client *client, struct wl_resource *resource) { wl_resource_destroy(resource);