mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-02 03:45:58 +01:00
wlr_scene: Fix not updating the scene node when setting a new buffer
If a new buffer is set for a buffer node, we must update the entire node unconditionally if the buffer size changes, or the buffer is given a buffer where it was previously NULL. While we're here, let's avoid calling scene_node_update on just damage updates. If the caller hasn't given us a damage region we just assume the whole buffer.
This commit is contained in:
parent
dd9cfd3e2f
commit
f0e31e806f
1 changed files with 31 additions and 15 deletions
|
@ -552,23 +552,32 @@ void wlr_scene_buffer_set_buffer_with_damage(struct wlr_scene_buffer *scene_buff
|
||||||
// coordinates.
|
// coordinates.
|
||||||
assert(buffer || !damage);
|
assert(buffer || !damage);
|
||||||
|
|
||||||
if (buffer != scene_buffer->buffer) {
|
if (buffer == scene_buffer->buffer) {
|
||||||
wlr_texture_destroy(scene_buffer->texture);
|
return;
|
||||||
scene_buffer->texture = NULL;
|
|
||||||
wlr_buffer_unlock(scene_buffer->buffer);
|
|
||||||
|
|
||||||
if (buffer) {
|
|
||||||
scene_buffer->buffer = wlr_buffer_lock(buffer);
|
|
||||||
} else {
|
|
||||||
scene_buffer->buffer = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!damage) {
|
|
||||||
scene_node_update(&scene_buffer->node, NULL);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!damage) {
|
bool update = false;
|
||||||
|
wlr_buffer_unlock(scene_buffer->buffer);
|
||||||
|
|
||||||
|
if (buffer) {
|
||||||
|
// if this node used to not be mapped or its previous displayed
|
||||||
|
// buffer region will be different from what the new buffer would
|
||||||
|
// produce we need to update the node.
|
||||||
|
update = !scene_buffer->buffer ||
|
||||||
|
(scene_buffer->dst_width == 0 && scene_buffer->dst_height == 0 &&
|
||||||
|
(scene_buffer->buffer->width != buffer->width ||
|
||||||
|
scene_buffer->buffer->height != buffer->height));
|
||||||
|
|
||||||
|
scene_buffer->buffer = wlr_buffer_lock(buffer);
|
||||||
|
} else {
|
||||||
|
update = true;
|
||||||
|
scene_buffer->buffer = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (update) {
|
||||||
|
scene_node_update(&scene_buffer->node, NULL);
|
||||||
|
// updating the node will already damage the whole node for us. Return
|
||||||
|
// early to not damage again
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -577,6 +586,12 @@ void wlr_scene_buffer_set_buffer_with_damage(struct wlr_scene_buffer *scene_buff
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pixman_region32_t fallback_damage;
|
||||||
|
pixman_region32_init_rect(&fallback_damage, 0, 0, buffer->width, buffer->height);
|
||||||
|
if (!damage) {
|
||||||
|
damage = &fallback_damage;
|
||||||
|
}
|
||||||
|
|
||||||
struct wlr_fbox box = scene_buffer->src_box;
|
struct wlr_fbox box = scene_buffer->src_box;
|
||||||
if (wlr_fbox_empty(&box)) {
|
if (wlr_fbox_empty(&box)) {
|
||||||
box.x = 0;
|
box.x = 0;
|
||||||
|
@ -633,6 +648,7 @@ void wlr_scene_buffer_set_buffer_with_damage(struct wlr_scene_buffer *scene_buff
|
||||||
}
|
}
|
||||||
|
|
||||||
pixman_region32_fini(&trans_damage);
|
pixman_region32_fini(&trans_damage);
|
||||||
|
pixman_region32_fini(&fallback_damage);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wlr_scene_buffer_set_buffer(struct wlr_scene_buffer *scene_buffer,
|
void wlr_scene_buffer_set_buffer(struct wlr_scene_buffer *scene_buffer,
|
||||||
|
|
Loading…
Reference in a new issue