blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backend/drm: use addon for wlr_drm_fb

This commit is contained in:
Simon Ser 2021-08-17 09:34:49 +02:00 committed by Kenny Levinsen
parent cae7b98136
commit 7544b7abf9
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
backend/drm/renderer.c
View File

@ -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, static void drm_fb_handle_destroy(struct wlr_addon *addon) {
void *data) { struct wlr_drm_fb *fb = wl_container_of(addon, fb, addon);
struct wlr_drm_fb *fb = wl_container_of(listener, fb, wlr_buf_destroy);
drm_fb_destroy(fb); 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, 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_buffer *buf, const struct wlr_drm_format_set *formats) {
struct wlr_drm_fb *fb = calloc(1, sizeof(*fb)); 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 = buf;
fb->wlr_buf_destroy.notify = drm_fb_handle_wlr_buf_destroy; wlr_addon_init(&fb->addon, &buf->addons, drm, &fb_addon_impl);
wl_signal_add(&buf->events.destroy, &fb->wlr_buf_destroy);
wl_list_insert(&drm->fbs, &fb->link); wl_list_insert(&drm->fbs, &fb->link);
return fb; return fb;
@ -305,7 +307,7 @@ error_get_dmabuf:
void drm_fb_destroy(struct wlr_drm_fb *fb) { void drm_fb_destroy(struct wlr_drm_fb *fb) {
wl_list_remove(&fb->link); 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); struct gbm_device *gbm = gbm_bo_get_device(fb->bo);
if (drmModeRmFB(gbm_device_get_fd(gbm), fb->id) != 0) { 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); 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, 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_buffer *buf, const struct wlr_drm_format_set *formats) {
struct wlr_drm_fb *fb = drm_fb_get(drm, buf); struct wlr_drm_fb *fb;
if (!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); fb = drm_fb_create(drm, buf, formats);
if (!fb) { if (!fb) {
return false; return false;

3
include/backend/drm/renderer.h
View File

@ -29,12 +29,11 @@ struct wlr_drm_surface {
struct wlr_drm_fb { struct wlr_drm_fb {
struct wlr_buffer *wlr_buf; struct wlr_buffer *wlr_buf;
struct wlr_addon addon;
struct wl_list link; // wlr_drm_backend.fbs struct wl_list link; // wlr_drm_backend.fbs
struct gbm_bo *bo; struct gbm_bo *bo;
uint32_t id; uint32_t id;
struct wl_listener wlr_buf_destroy;
}; };
bool init_drm_renderer(struct wlr_drm_backend *drm, bool init_drm_renderer(struct wlr_drm_backend *drm,