mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-17 06:46:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

wlr_raster: Add backwards compatibility with wlr_client_buffer

Browse source
This commit is contained in:
Alexander Orzechowski 2024-04-10 11:54:56 -04:00
parent 851440f59d
commit ce09ecedfd
1 changed files with 41 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

41
types/wlr_raster.c
View file

@ -279,6 +279,21 @@ static struct surface_raster *get_surface_raster(struct wlr_surface *surface) {
return surface_raster; return surface_raster;
} }
// Because wlr_raster doesn't lock the buffer itself, we need something extra
// to keep client buffer locked when operating in legacy mode.
struct client_buffer_compat {
struct wlr_client_buffer *buffer;
struct wl_listener destroy;
};
static void client_buffer_compat_raster_destroy(struct wl_listener *listener, void *data) {
struct client_buffer_compat *compat = wl_container_of(listener, compat, destroy);
wlr_buffer_unlock(&compat->buffer->base);
wl_list_remove(&compat->destroy.link);
free(compat);
}
struct wlr_raster *wlr_raster_from_surface(struct wlr_surface *surface) { struct wlr_raster *wlr_raster_from_surface(struct wlr_surface *surface) {
struct wlr_linux_drm_syncobj_surface_v1_state *syncobj_surface_state = struct wlr_linux_drm_syncobj_surface_v1_state *syncobj_surface_state =
wlr_linux_drm_syncobj_v1_get_surface_state(surface); wlr_linux_drm_syncobj_v1_get_surface_state(surface);
@ -289,6 +304,32 @@ struct wlr_raster *wlr_raster_from_surface(struct wlr_surface *surface) {
options.wait_point = syncobj_surface_state->acquire_point; options.wait_point = syncobj_surface_state->acquire_point;
} }
if (surface->compositor->renderer) {
// use legacy wlr_client_buffer
if (!surface->buffer) {
return NULL;
}
struct client_buffer_compat *compat = calloc(1, sizeof(*compat));
if (!compat) {
return NULL;
}
struct wlr_raster *raster = wlr_raster_create(&surface->buffer->base, &options);
if (!raster) {
free(compat);
return NULL;
}
compat->destroy.notify = client_buffer_compat_raster_destroy;
wl_signal_add(&raster->events.destroy, &compat->destroy);
compat->buffer = surface->buffer;
wlr_buffer_lock(&surface->buffer->base);
return raster;
}
struct surface_raster *surface_raster = get_surface_raster(surface); struct surface_raster *surface_raster = get_surface_raster(surface);
if (!surface_raster) { if (!surface_raster) {
surface_raster = calloc(1, sizeof(*surface_raster)); surface_raster = calloc(1, sizeof(*surface_raster));