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

scene: make wlr_scene_buffer release buffers

Browse source 
Make wlr_scene_buffer release buffers as soon as it doesn't need
them anymore. This allows the caller to re-use the buffer.
This commit is contained in:
Simon Ser 2023-04-11 21:51:14 +02:00
parent 9affcaa93c
commit 0a8e8aec58
2 changed files with 56 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/wlr/types/wlr_scene.h
View file

@ -173,6 +173,8 @@ struct wlr_scene_buffer {
enum wl_output_transform transform; enum wl_output_transform transform;
pixman_region32_t opaque_region; pixman_region32_t opaque_region;
struct wlr_linux_dmabuf_feedback_v1_init_options prev_feedback_options; struct wlr_linux_dmabuf_feedback_v1_init_options prev_feedback_options;
bool buffer_locked;
struct wl_listener buffer_release;
}; };
/** A viewport for an output in the scene-graph */ /** A viewport for an output in the scene-graph */

76
types/scene/wlr_scene.c
View file

@ -108,7 +108,10 @@ void wlr_scene_node_destroy(struct wlr_scene_node *node) {
} }
wlr_texture_destroy(scene_buffer->texture); wlr_texture_destroy(scene_buffer->texture);
wlr_buffer_unlock(scene_buffer->buffer); if (scene_buffer->buffer_locked) {
wlr_buffer_unlock(scene_buffer->buffer);
}
wl_list_remove(&scene_buffer->buffer_release.link);
pixman_region32_fini(&scene_buffer->opaque_region); pixman_region32_fini(&scene_buffer->opaque_region);
} else if (node->type == WLR_SCENE_NODE_TREE) { } else if (node->type == WLR_SCENE_NODE_TREE) {
struct wlr_scene_tree *scene_tree = scene_tree_from_node(node); struct wlr_scene_tree *scene_tree = scene_tree_from_node(node);
@ -237,11 +240,11 @@ static void scene_node_opaque_region(struct wlr_scene_node *node, int x, int y,
} else if (node->type == WLR_SCENE_NODE_BUFFER) { } else if (node->type == WLR_SCENE_NODE_BUFFER) {
struct wlr_scene_buffer *scene_buffer = wlr_scene_buffer_from_node(node); struct wlr_scene_buffer *scene_buffer = wlr_scene_buffer_from_node(node);
if (!scene_buffer->buffer) { if (!scene_buffer->buffer && !scene_buffer->texture) {
return; return;
} }
if (!buffer_is_opaque(scene_buffer->buffer)) { if (!scene_buffer->buffer || !buffer_is_opaque(scene_buffer->buffer)) {
pixman_region32_copy(opaque, &scene_buffer->opaque_region); pixman_region32_copy(opaque, &scene_buffer->opaque_region);
pixman_region32_translate(opaque, x, y); pixman_region32_translate(opaque, x, y);
return; return;
@ -578,9 +581,7 @@ struct wlr_scene_buffer *wlr_scene_buffer_create(struct wlr_scene_tree *parent,
assert(parent); assert(parent);
scene_node_init(&scene_buffer->node, WLR_SCENE_NODE_BUFFER, parent); scene_node_init(&scene_buffer->node, WLR_SCENE_NODE_BUFFER, parent);
if (buffer) { wl_list_init(&scene_buffer->buffer_release.link);
scene_buffer->buffer = wlr_buffer_lock(buffer);
}
wl_signal_init(&scene_buffer->events.outputs_update); wl_signal_init(&scene_buffer->events.outputs_update);
wl_signal_init(&scene_buffer->events.output_enter); wl_signal_init(&scene_buffer->events.output_enter);
@ -589,11 +590,20 @@ struct wlr_scene_buffer *wlr_scene_buffer_create(struct wlr_scene_tree *parent,
wl_signal_init(&scene_buffer->events.frame_done); wl_signal_init(&scene_buffer->events.frame_done);
pixman_region32_init(&scene_buffer->opaque_region); pixman_region32_init(&scene_buffer->opaque_region);
wlr_scene_buffer_set_buffer(scene_buffer, buffer);
scene_node_update(&scene_buffer->node, NULL); scene_node_update(&scene_buffer->node, NULL);
return scene_buffer; return scene_buffer;
} }
static void scene_buffer_handle_release(struct wl_listener *listener, void *data) {
struct wlr_scene_buffer *scene_buffer =
wl_container_of(listener, scene_buffer, buffer_release);
wl_list_remove(&scene_buffer->buffer_release.link);
wl_list_init(&scene_buffer->buffer_release.link);
scene_buffer->buffer = NULL;
}
void wlr_scene_buffer_set_buffer_with_damage(struct wlr_scene_buffer *scene_buffer, void wlr_scene_buffer_set_buffer_with_damage(struct wlr_scene_buffer *scene_buffer,
struct wlr_buffer *buffer, const pixman_region32_t *damage) { struct wlr_buffer *buffer, const pixman_region32_t *damage) {
// specifying a region for a NULL buffer doesn't make sense. We need to know // specifying a region for a NULL buffer doesn't make sense. We need to know
@ -601,12 +611,18 @@ void wlr_scene_buffer_set_buffer_with_damage(struct wlr_scene_buffer *scene_buff
// coordinates. // coordinates.
assert(buffer || !damage); assert(buffer || !damage);
bool update = false; wl_list_remove(&scene_buffer->buffer_release.link);
wlr_buffer_unlock(scene_buffer->buffer); wl_list_init(&scene_buffer->buffer_release.link);
if (scene_buffer->buffer_locked) {
wlr_buffer_unlock(scene_buffer->buffer);
}
scene_buffer->buffer = NULL;
scene_buffer->buffer_locked = false;
wlr_texture_destroy(scene_buffer->texture); wlr_texture_destroy(scene_buffer->texture);
scene_buffer->texture = NULL; scene_buffer->texture = NULL;
bool update = false;
if (buffer) { if (buffer) {
// if this node used to not be mapped or its previous displayed // if this node used to not be mapped or its previous displayed
// buffer region will be different from what the new buffer would // buffer region will be different from what the new buffer would
@ -617,9 +633,11 @@ void wlr_scene_buffer_set_buffer_with_damage(struct wlr_scene_buffer *scene_buff
scene_buffer->buffer->height != buffer->height)); scene_buffer->buffer->height != buffer->height));
scene_buffer->buffer = wlr_buffer_lock(buffer); scene_buffer->buffer = wlr_buffer_lock(buffer);
scene_buffer->buffer_locked = true;
scene_buffer->buffer_release.notify = scene_buffer_handle_release;
wl_signal_add(&buffer->events.release, &scene_buffer->buffer_release);
} else { } else {
update = true; update = true;
scene_buffer->buffer = NULL;
} }
if (update) { if (update) {
@ -781,18 +799,24 @@ void wlr_scene_buffer_send_frame_done(struct wlr_scene_buffer *scene_buffer,
static struct wlr_texture *scene_buffer_get_texture( static struct wlr_texture *scene_buffer_get_texture(
struct wlr_scene_buffer *scene_buffer, struct wlr_renderer *renderer) { struct wlr_scene_buffer *scene_buffer, struct wlr_renderer *renderer) {
if (scene_buffer->texture != NULL) {
return scene_buffer->texture;
}
if (!scene_buffer->buffer_locked) {
return NULL;
}
struct wlr_client_buffer *client_buffer = struct wlr_client_buffer *client_buffer =
wlr_client_buffer_get(scene_buffer->buffer); wlr_client_buffer_get(scene_buffer->buffer);
if (client_buffer != NULL) { if (client_buffer != NULL) {
return client_buffer->texture; return client_buffer->texture;
} }
if (scene_buffer->texture != NULL) {
return scene_buffer->texture;
}
scene_buffer->texture = scene_buffer->texture =
wlr_texture_from_buffer(renderer, scene_buffer->buffer); wlr_texture_from_buffer(renderer, scene_buffer->buffer);
wlr_buffer_unlock(scene_buffer->buffer);
scene_buffer->buffer_locked = false;
return scene_buffer->texture; return scene_buffer->texture;
} }
@ -814,13 +838,22 @@ static void scene_node_get_size(struct wlr_scene_node *node,
if (scene_buffer->dst_width > 0 && scene_buffer->dst_height > 0) { if (scene_buffer->dst_width > 0 && scene_buffer->dst_height > 0) {
*width = scene_buffer->dst_width; *width = scene_buffer->dst_width;
*height = scene_buffer->dst_height; *height = scene_buffer->dst_height;
} else if (scene_buffer->buffer) { } else if (scene_buffer->buffer || scene_buffer->texture) {
if (scene_buffer->transform & WL_OUTPUT_TRANSFORM_90) { int w, h;
*height = scene_buffer->buffer->width; if (scene_buffer->buffer) {
*width = scene_buffer->buffer->height; w = scene_buffer->buffer->width;
h = scene_buffer->buffer->height;
} else { } else {
*width = scene_buffer->buffer->width; w = scene_buffer->texture->width;
*height = scene_buffer->buffer->height; h = scene_buffer->texture->height;
}
if (scene_buffer->transform & WL_OUTPUT_TRANSFORM_90) {
*height = w;
*width = h;
} else {
*width = w;
*height = h;
} }
} }
break; break;
@ -1141,7 +1174,6 @@ static void scene_node_render(struct wlr_scene_node *node,
break; break;
case WLR_SCENE_NODE_BUFFER:; case WLR_SCENE_NODE_BUFFER:;
struct wlr_scene_buffer *scene_buffer = wlr_scene_buffer_from_node(node); struct wlr_scene_buffer *scene_buffer = wlr_scene_buffer_from_node(node);
assert(scene_buffer->buffer);
struct wlr_renderer *renderer = output->renderer; struct wlr_renderer *renderer = output->renderer;
texture = scene_buffer_get_texture(scene_buffer, renderer); texture = scene_buffer_get_texture(scene_buffer, renderer);
@ -1373,7 +1405,7 @@ static bool scene_node_invisible(struct wlr_scene_node *node) {
} else if (node->type == WLR_SCENE_NODE_BUFFER) { } else if (node->type == WLR_SCENE_NODE_BUFFER) {
struct wlr_scene_buffer *buffer = wlr_scene_buffer_from_node(node); struct wlr_scene_buffer *buffer = wlr_scene_buffer_from_node(node);
return buffer->buffer == NULL; return buffer->buffer == NULL && buffer->texture == NULL;
} }
return false; return false;
@ -1486,7 +1518,7 @@ static bool scene_buffer_can_consider_direct_scanout(struct wlr_scene_buffer *bu
return false; return false;
} }
if (node->type != WLR_SCENE_NODE_BUFFER) { if (node->type != WLR_SCENE_NODE_BUFFER || buffer->buffer == NULL) {
return false; return false;
} }