summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ser <[email protected]>2022-03-13 11:21:56 +0100
committerSimon Ser <[email protected]>2022-03-16 16:42:45 +0000
commit339ef8dbd92c21c8d807024b875fc0887666430f (patch)
tree395adb5df34ce5b2ca71548a57b1c7179e007c26
parent35b3b273b93de057c4976527547dbfab46e64fee (diff)
Revert "scene: try to import buffers as textures before rendering"
This reverts commit 3db1bcbe641b407b9f5c9e5d0a012b45aa2c6cb7. Since [1], importing buffers as textures before wlr_renderer_begin isn't necessary anymore. [1]: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3464
-rw-r--r--wlr_scene.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/wlr_scene.c b/wlr_scene.c
index 5d5ff96..9353fef 100644
--- a/wlr_scene.c
+++ b/wlr_scene.c
@@ -130,7 +130,6 @@ void wlr_scene_node_destroy(struct wlr_scene_node *node) {
break;
case WLR_SCENE_NODE_BUFFER:;
struct wlr_scene_buffer *scene_buffer = scene_buffer_from_node(node);
- wl_list_remove(&scene_buffer->pending_link);
wlr_texture_destroy(scene_buffer->texture);
wlr_buffer_unlock(scene_buffer->buffer);
free(scene_buffer);
@@ -146,7 +145,6 @@ struct wlr_scene *wlr_scene_create(void) {
scene_node_init(&scene->node, WLR_SCENE_NODE_ROOT, NULL);
wl_list_init(&scene->outputs);
wl_list_init(&scene->presentation_destroy.link);
- wl_list_init(&scene->pending_buffers);
return scene;
}
@@ -362,9 +360,6 @@ struct wlr_scene_buffer *wlr_scene_buffer_create(struct wlr_scene_node *parent,
scene_node_damage_whole(&scene_buffer->node);
- struct wlr_scene *scene = scene_node_get_root(parent);
- wl_list_insert(&scene->pending_buffers, &scene_buffer->pending_link);
-
return scene_buffer;
}
@@ -1118,15 +1113,6 @@ bool wlr_scene_output_commit(struct wlr_scene_output *scene_output) {
return true;
}
- // Try to import new buffers as textures
- struct wlr_scene_buffer *scene_buffer, *scene_buffer_tmp;
- wl_list_for_each_safe(scene_buffer, scene_buffer_tmp,
- &scene_output->scene->pending_buffers, pending_link) {
- scene_buffer_get_texture(scene_buffer, renderer);
- wl_list_remove(&scene_buffer->pending_link);
- wl_list_init(&scene_buffer->pending_link);
- }
-
wlr_renderer_begin(renderer, output->width, output->height);
int nrects;