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

scene: update textures with damage

Browse source
This commit is contained in:
Simon Ser 2023-04-11 22:07:39 +02:00
parent 0a8e8aec58
commit dd0e70af5d
2 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -171,7 +171,7 @@ struct wlr_scene_buffer {
struct wlr_fbox src_box; struct wlr_fbox src_box;
int dst_width, dst_height; int dst_width, dst_height;
enum wl_output_transform transform; enum wl_output_transform transform;
pixman_region32_t opaque_region; pixman_region32_t damage, 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; bool buffer_locked;
struct wl_listener buffer_release; struct wl_listener buffer_release;

31
types/scene/wlr_scene.c
View file

@ -112,6 +112,7 @@ void wlr_scene_node_destroy(struct wlr_scene_node *node) {
wlr_buffer_unlock(scene_buffer->buffer); wlr_buffer_unlock(scene_buffer->buffer);
} }
wl_list_remove(&scene_buffer->buffer_release.link); wl_list_remove(&scene_buffer->buffer_release.link);
pixman_region32_fini(&scene_buffer->damage);
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);
@ -588,6 +589,7 @@ struct wlr_scene_buffer *wlr_scene_buffer_create(struct wlr_scene_tree *parent,
wl_signal_init(&scene_buffer->events.output_leave); wl_signal_init(&scene_buffer->events.output_leave);
wl_signal_init(&scene_buffer->events.output_present); wl_signal_init(&scene_buffer->events.output_present);
wl_signal_init(&scene_buffer->events.frame_done); wl_signal_init(&scene_buffer->events.frame_done);
pixman_region32_init(&scene_buffer->damage);
pixman_region32_init(&scene_buffer->opaque_region); pixman_region32_init(&scene_buffer->opaque_region);
wlr_scene_buffer_set_buffer(scene_buffer, buffer); wlr_scene_buffer_set_buffer(scene_buffer, buffer);
@ -619,9 +621,6 @@ void wlr_scene_buffer_set_buffer_with_damage(struct wlr_scene_buffer *scene_buff
scene_buffer->buffer = NULL; scene_buffer->buffer = NULL;
scene_buffer->buffer_locked = false; scene_buffer->buffer_locked = false;
wlr_texture_destroy(scene_buffer->texture);
scene_buffer->texture = NULL;
bool update = false; 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
@ -640,6 +639,14 @@ void wlr_scene_buffer_set_buffer_with_damage(struct wlr_scene_buffer *scene_buff
update = true; update = true;
} }
if (damage != NULL) {
pixman_region32_union(&scene_buffer->damage, &scene_buffer->damage,
damage);
} else if (buffer != NULL) {
pixman_region32_union_rect(&scene_buffer->damage, &scene_buffer->damage,
0, 0, buffer->width, buffer->height);
}
if (update) { if (update) {
scene_node_update(&scene_buffer->node, NULL); scene_node_update(&scene_buffer->node, NULL);
// updating the node will already damage the whole node for us. Return // updating the node will already damage the whole node for us. Return
@ -799,7 +806,8 @@ 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) { if (scene_buffer->texture != NULL &&
!pixman_region32_not_empty(&scene_buffer->damage)) {
return scene_buffer->texture; return scene_buffer->texture;
} }
@ -813,10 +821,21 @@ static struct wlr_texture *scene_buffer_get_texture(
return client_buffer->texture; return client_buffer->texture;
} }
scene_buffer->texture = if (scene_buffer->texture == NULL ||
wlr_texture_from_buffer(renderer, scene_buffer->buffer); !wlr_texture_update_from_buffer(scene_buffer->texture, scene_buffer->buffer, &scene_buffer->damage)) {
struct wlr_texture *texture = wlr_texture_from_buffer(renderer, scene_buffer->buffer);
if (texture == NULL) {
return NULL;
}
wlr_texture_destroy(scene_buffer->texture);
scene_buffer->texture = texture;
}
wlr_buffer_unlock(scene_buffer->buffer); wlr_buffer_unlock(scene_buffer->buffer);
scene_buffer->buffer_locked = false; scene_buffer->buffer_locked = false;
pixman_region32_clear(&scene_buffer->damage);
return scene_buffer->texture; return scene_buffer->texture;
} }