nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 16:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

scene: add scene_buffer_set_texture()

Browse Source
This commit is contained in:
Simon Ser 2024-03-14 14:00:09 +01:00
parent f0d8377732
commit 3d9f330ee0
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
types/scene/wlr_scene.c
View File

@ -83,6 +83,8 @@ struct highlight_region {
static void scene_buffer_set_buffer(struct wlr_scene_buffer *scene_buffer, static void scene_buffer_set_buffer(struct wlr_scene_buffer *scene_buffer,
struct wlr_buffer *buffer); struct wlr_buffer *buffer);
static void scene_buffer_set_texture(struct wlr_scene_buffer *scene_buffer,
struct wlr_texture *texture);
void wlr_scene_node_destroy(struct wlr_scene_node *node) { void wlr_scene_node_destroy(struct wlr_scene_node *node) {
if (node == NULL) { if (node == NULL) {
@ -112,8 +114,8 @@ void wlr_scene_node_destroy(struct wlr_scene_node *node) {
} }
} }
wlr_texture_destroy(scene_buffer->texture);
scene_buffer_set_buffer(scene_buffer, NULL); scene_buffer_set_buffer(scene_buffer, NULL);
scene_buffer_set_texture(scene_buffer, NULL);
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 = wlr_scene_tree_from_node(node); struct wlr_scene_tree *scene_tree = wlr_scene_tree_from_node(node);
@ -635,6 +637,12 @@ static void scene_buffer_set_buffer(struct wlr_scene_buffer *scene_buffer,
wl_signal_add(&buffer->events.release, &scene_buffer->buffer_release); wl_signal_add(&buffer->events.release, &scene_buffer->buffer_release);
} }
static void scene_buffer_set_texture(struct wlr_scene_buffer *scene_buffer,
struct wlr_texture *texture) {
wlr_texture_destroy(scene_buffer->texture);
scene_buffer->texture = texture;
}
struct wlr_scene_buffer *wlr_scene_buffer_create(struct wlr_scene_tree *parent, struct wlr_scene_buffer *wlr_scene_buffer_create(struct wlr_scene_tree *parent,
struct wlr_buffer *buffer) { struct wlr_buffer *buffer) {
struct wlr_scene_buffer *scene_buffer = calloc(1, sizeof(*scene_buffer)); struct wlr_scene_buffer *scene_buffer = calloc(1, sizeof(*scene_buffer));
@ -683,10 +691,8 @@ 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;
} }
wlr_texture_destroy(scene_buffer->texture);
scene_buffer->texture = NULL;
scene_buffer_set_buffer(scene_buffer, buffer); scene_buffer_set_buffer(scene_buffer, buffer);
scene_buffer_set_texture(scene_buffer, NULL);
if (update) { if (update) {
scene_node_update(&scene_buffer->node, NULL); scene_node_update(&scene_buffer->node, NULL);
@ -885,13 +891,14 @@ static struct wlr_texture *scene_buffer_get_texture(
return client_buffer->texture; return client_buffer->texture;
} }
scene_buffer->texture = struct wlr_texture *texture =
wlr_texture_from_buffer(renderer, scene_buffer->buffer); wlr_texture_from_buffer(renderer, scene_buffer->buffer);
if (scene_buffer->texture != NULL && scene_buffer->own_buffer) { if (texture != NULL && scene_buffer->own_buffer) {
scene_buffer->own_buffer = false; scene_buffer->own_buffer = false;
wlr_buffer_unlock(scene_buffer->buffer); wlr_buffer_unlock(scene_buffer->buffer);
} }
return scene_buffer->texture; scene_buffer_set_texture(scene_buffer, texture);
return texture;
} }
static void scene_node_get_size(struct wlr_scene_node *node, static void scene_node_get_size(struct wlr_scene_node *node,