From 7544b7abf9997ac9b53777afb4396f92ecc867ba Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Tue, 17 Aug 2021 09:34:49 +0200
Subject: [PATCH] backend/drm: use addon for wlr_drm_fb

---
 backend/drm/renderer.c         | 34 ++++++++++++++--------------------
 include/backend/drm/renderer.h |  3 +--
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c
index 7531ec32..adda8fd5 100644
--- a/backend/drm/renderer.c
+++ b/backend/drm/renderer.c
@@ -232,12 +232,16 @@ static struct gbm_bo *get_bo_for_dmabuf(struct gbm_device *gbm,
 	}
 }
 
-static void drm_fb_handle_wlr_buf_destroy(struct wl_listener *listener,
-		void *data) {
-	struct wlr_drm_fb *fb = wl_container_of(listener, fb, wlr_buf_destroy);
+static void drm_fb_handle_destroy(struct wlr_addon *addon) {
+	struct wlr_drm_fb *fb = wl_container_of(addon, fb, addon);
 	drm_fb_destroy(fb);
 }
 
+static const struct wlr_addon_interface fb_addon_impl = {
+	.name = "wlr_drm_fb",
+	.destroy = drm_fb_handle_destroy,
+};
+
 static struct wlr_drm_fb *drm_fb_create(struct wlr_drm_backend *drm,
 		struct wlr_buffer *buf, const struct wlr_drm_format_set *formats) {
 	struct wlr_drm_fb *fb = calloc(1, sizeof(*fb));
@@ -289,9 +293,7 @@ static struct wlr_drm_fb *drm_fb_create(struct wlr_drm_backend *drm,
 
 	fb->wlr_buf = buf;
 
-	fb->wlr_buf_destroy.notify = drm_fb_handle_wlr_buf_destroy;
-	wl_signal_add(&buf->events.destroy, &fb->wlr_buf_destroy);
-
+	wlr_addon_init(&fb->addon, &buf->addons, drm, &fb_addon_impl);
 	wl_list_insert(&drm->fbs, &fb->link);
 
 	return fb;
@@ -305,7 +307,7 @@ error_get_dmabuf:
 
 void drm_fb_destroy(struct wlr_drm_fb *fb) {
 	wl_list_remove(&fb->link);
-	wl_list_remove(&fb->wlr_buf_destroy.link);
+	wlr_addon_finish(&fb->addon);
 
 	struct gbm_device *gbm = gbm_bo_get_device(fb->bo);
 	if (drmModeRmFB(gbm_device_get_fd(gbm), fb->id) != 0) {
@@ -316,21 +318,13 @@ void drm_fb_destroy(struct wlr_drm_fb *fb) {
 	free(fb);
 }
 
-static struct wlr_drm_fb *drm_fb_get(struct wlr_drm_backend *drm,
-		struct wlr_buffer *local_buf) {
-	struct wlr_drm_fb *fb;
-	wl_list_for_each(fb, &drm->fbs, link) {
-		if (fb->wlr_buf == local_buf) {
-			return fb;
-		}
-	}
-	return NULL;
-}
-
 bool drm_fb_import(struct wlr_drm_fb **fb_ptr, struct wlr_drm_backend *drm,
 		struct wlr_buffer *buf, const struct wlr_drm_format_set *formats) {
-	struct wlr_drm_fb *fb = drm_fb_get(drm, buf);
-	if (!fb) {
+	struct wlr_drm_fb *fb;
+	struct wlr_addon *addon = wlr_addon_find(&buf->addons, drm, &fb_addon_impl);
+	if (addon != NULL) {
+		fb = wl_container_of(addon, fb, addon);
+	} else {
 		fb = drm_fb_create(drm, buf, formats);
 		if (!fb) {
 			return false;
diff --git a/include/backend/drm/renderer.h b/include/backend/drm/renderer.h
index f6b996c7..70a9533b 100644
--- a/include/backend/drm/renderer.h
+++ b/include/backend/drm/renderer.h
@@ -29,12 +29,11 @@ struct wlr_drm_surface {
 
 struct wlr_drm_fb {
 	struct wlr_buffer *wlr_buf;
+	struct wlr_addon addon;
 	struct wl_list link; // wlr_drm_backend.fbs
 
 	struct gbm_bo *bo;
 	uint32_t id;
-
-	struct wl_listener wlr_buf_destroy;
 };
 
 bool init_drm_renderer(struct wlr_drm_backend *drm,