fdo-mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-01-26 03:40:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fifo-v1: add scene implementation

Browse source 
Signed-off-by: Sergio Gómez <sergio.g.delreal@gmail.com>
This commit is contained in:
Sergio Gómez 2025-11-26 10:56:16 -05:00
parent c78bce9cc2
commit 9de6dc0964
3 changed files with 75 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -104,6 +104,7 @@ struct wlr_scene {
struct wlr_linux_dmabuf_v1 *linux_dmabuf_v1;
struct wlr_gamma_control_manager_v1 *gamma_control_manager_v1;
struct wlr_color_manager_v1 *color_manager_v1;
struct wlr_fifo_manager_v1 *fifo_manager_v1;
bool restack_xwayland_surfaces;
@ -112,6 +113,8 @@ struct wlr_scene {
struct wl_listener gamma_control_manager_v1_destroy;
struct wl_listener gamma_control_manager_v1_set_gamma;
struct wl_listener color_manager_v1_destroy;
struct wl_listener fifo_manager_v1_destroy;
struct wl_listener fifo_manager_v1_new_fifo;
enum wlr_scene_debug_damage_option debug_damage_option;
bool direct_scanout;
@ -125,6 +128,8 @@ struct wlr_scene_surface {
struct wlr_scene_buffer *buffer;
struct wlr_surface *surface;
struct wlr_fifo_v1 *fifo;
struct {
struct wlr_box clip;
@ -137,6 +142,7 @@ struct wlr_scene_surface {
struct wl_listener frame_done;
struct wl_listener surface_destroy;
struct wl_listener surface_commit;
struct wl_listener fifo_v1_destroy;
} WLR_PRIVATE;
};
@ -381,6 +387,12 @@ void wlr_scene_set_gamma_control_manager_v1(struct wlr_scene *scene,
*/
void wlr_scene_set_color_manager_v1(struct wlr_scene *scene, struct wlr_color_manager_v1 *manager);
/**
* Handles fifo_v1 for all surfaces and their primary outputs in the scene.
*/
void wlr_scene_set_fifo_manager_v1(struct wlr_scene *scene,
struct wlr_fifo_manager_v1 *fifo_manager);
/**
* Add a node displaying nothing but its children.
*/

7
types/scene/surface.c
View file

@ -5,6 +5,7 @@
#include <wlr/types/wlr_color_representation_v1.h>
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_scene.h>
#include <wlr/types/wlr_fifo_v1.h>
#include <wlr/types/wlr_fractional_scale_v1.h>
#include <wlr/types/wlr_linux_drm_syncobj_v1.h>
#include <wlr/types/wlr_output.h>
@ -99,6 +100,9 @@ static void handle_scene_buffer_outputs_update(
// If the surface is no longer visible on any output, keep the last sent
// preferred configuration to avoid unnecessary redraws
if (wl_list_empty(&surface->surface->current_outputs)) {
if (surface->fifo) {
wlr_fifo_v1_set_output(surface->fifo, NULL);
}
return;
}
@ -112,6 +116,9 @@ static void handle_scene_buffer_outputs_update(
wlr_color_manager_v1_set_surface_preferred_image_description(scene->color_manager_v1,
surface->surface, &img_desc);
}
if (surface->fifo) {
wlr_fifo_v1_set_output(surface->fifo, surface->buffer->primary_output->output);
}
}
static void handle_scene_buffer_output_enter(

56
types/scene/wlr_scene.c
View file

@ -8,6 +8,7 @@
#include <wlr/types/wlr_color_management_v1.h>
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_damage_ring.h>
#include <wlr/types/wlr_fifo_v1.h>
#include <wlr/types/wlr_gamma_control_v1.h>
#include <wlr/types/wlr_linux_dmabuf_v1.h>
#include <wlr/types/wlr_presentation_time.h>
@ -1640,6 +1641,61 @@ void wlr_scene_set_color_manager_v1(struct wlr_scene *scene, struct wlr_color_ma
wl_signal_add(&manager->events.destroy, &scene->color_manager_v1_destroy);
}
static void scene_surface_handle_fifo_v1_destroy(struct wl_listener *listener,
void *data) {
struct wlr_scene_surface *surface =
wl_container_of(listener, surface, fifo_v1_destroy);
wl_list_remove(&surface->fifo_v1_destroy.link);
surface->fifo = NULL;
}
static void fifo_set_output(struct wlr_scene_buffer *scene_buffer, int x, int y, void *data) {
struct wlr_scene_surface *scene_surface =
wlr_scene_surface_try_from_buffer(scene_buffer);
if (!scene_surface) {
return;
}
struct wlr_fifo_v1 *fifo = data;
if (scene_surface->surface == fifo->surface) {
scene_surface->fifo = fifo;
scene_surface->fifo_v1_destroy.notify = scene_surface_handle_fifo_v1_destroy;
wl_signal_add(&fifo->events.destroy, &scene_surface->fifo_v1_destroy);
wlr_fifo_v1_set_output(fifo, scene_buffer->primary_output ?
scene_buffer->primary_output->output : NULL);
}
}
static void scene_handle_fifo_manager_v1_new_fifo(struct wl_listener *listener,
void *data) {
struct wlr_scene *scene =
wl_container_of(listener, scene, fifo_manager_v1_new_fifo);
struct wlr_fifo_manager_v1_new_fifo_event *event = data;
wlr_scene_node_for_each_buffer(&scene->tree.node, fifo_set_output, event->fifo);
}
static void scene_handle_fifo_manager_v1_destroy(struct wl_listener *listener,
void *data) {
struct wlr_scene *scene =
wl_container_of(listener, scene, fifo_manager_v1_destroy);
wl_list_remove(&scene->fifo_manager_v1_destroy.link);
wl_list_init(&scene->fifo_manager_v1_destroy.link);
wl_list_remove(&scene->fifo_manager_v1_new_fifo.link);
wl_list_init(&scene->fifo_manager_v1_new_fifo.link);
scene->fifo_manager_v1 = NULL;
}
void wlr_scene_set_fifo_manager_v1(struct wlr_scene *scene,
struct wlr_fifo_manager_v1 *fifo_manager) {
assert(scene->fifo_manager_v1 == NULL);
scene->fifo_manager_v1 = fifo_manager;
scene->fifo_manager_v1_new_fifo.notify = scene_handle_fifo_manager_v1_new_fifo;
wl_signal_add(&fifo_manager->events.new_fifo, &scene->fifo_manager_v1_new_fifo);
scene->fifo_manager_v1_destroy.notify = scene_handle_fifo_manager_v1_destroy;
wl_signal_add(&fifo_manager->events.destroy, &scene->fifo_manager_v1_destroy);
}
static void scene_output_handle_destroy(struct wlr_addon *addon) {
struct wlr_scene_output *scene_output =
wl_container_of(addon, scene_output, addon);