diff options
| author | Simon Ser <contact@emersion.fr> | 2022-11-24 10:04:15 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2022-11-30 14:14:02 +0100 |
| commit | 444d94ef89b74500610f36c89a31f668e35a0f03 (patch) | |
| tree | e34f6c9123bc34b1c6a83b548e76b8afe4e85f85 | |
| parent | 0611c10909b17276bd633a4ee9a322995e9a3580 (diff) | |
linux-dmabuf-v1: add "_with_renderer" suffix to create() function
Make it clear this is a helper consuming a wlr_renderer. We'll
add a lower-level create() function which doesn't take it in the
next commit.
| -rw-r--r-- | include/wlr/types/wlr_linux_dmabuf_v1.h | 6 | ||||
| -rw-r--r-- | render/wlr_renderer.c | 2 | ||||
| -rw-r--r-- | types/wlr_linux_dmabuf_v1.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/wlr/types/wlr_linux_dmabuf_v1.h b/include/wlr/types/wlr_linux_dmabuf_v1.h index 6b5f0d68..bfc024eb 100644 --- a/include/wlr/types/wlr_linux_dmabuf_v1.h +++ b/include/wlr/types/wlr_linux_dmabuf_v1.h @@ -72,9 +72,11 @@ struct wlr_linux_dmabuf_v1 { }; /** - * Create linux-dmabuf interface. + * Create the linux-dmabuf-unstable-v1 global. + * + * The default DMA-BUF feedback is initialized from the struct wlr_renderer. */ -struct wlr_linux_dmabuf_v1 *wlr_linux_dmabuf_v1_create(struct wl_display *display, +struct wlr_linux_dmabuf_v1 *wlr_linux_dmabuf_v1_create_with_renderer(struct wl_display *display, struct wlr_renderer *renderer); /** diff --git a/render/wlr_renderer.c b/render/wlr_renderer.c index 552488ba..3f0d56ac 100644 --- a/render/wlr_renderer.c +++ b/render/wlr_renderer.c @@ -232,7 +232,7 @@ bool wlr_renderer_init_wl_display(struct wlr_renderer *r, wlr_log(WLR_INFO, "Cannot get renderer DRM FD, disabling wl_drm"); } - if (wlr_linux_dmabuf_v1_create(wl_display, r) == NULL) { + if (wlr_linux_dmabuf_v1_create_with_renderer(wl_display, r) == NULL) { return false; } } diff --git a/types/wlr_linux_dmabuf_v1.c b/types/wlr_linux_dmabuf_v1.c index d6b2d8ef..e463d4d5 100644 --- a/types/wlr_linux_dmabuf_v1.c +++ b/types/wlr_linux_dmabuf_v1.c @@ -926,7 +926,7 @@ static void handle_renderer_destroy(struct wl_listener *listener, void *data) { linux_dmabuf_v1_destroy(linux_dmabuf); } -struct wlr_linux_dmabuf_v1 *wlr_linux_dmabuf_v1_create(struct wl_display *display, +struct wlr_linux_dmabuf_v1 *wlr_linux_dmabuf_v1_create_with_renderer(struct wl_display *display, struct wlr_renderer *renderer) { struct wlr_linux_dmabuf_v1 *linux_dmabuf = calloc(1, sizeof(struct wlr_linux_dmabuf_v1)); |