fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-20 04:40:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

compositor: Move dirty buffer handling to paint node early update

Browse source 
This was in the late update because attaching buffers is something only
the renderer cares about.

However, the upcoming drm plane state re-use patches need to know if the
buffer changed before assign_planes, so we need this in the early update.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2025-10-20 14:57:08 -05:00 • committed by Daniel Stone
parent 6155981cc6
commit 008884f289
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libweston/compositor.c
View file

@ -205,6 +205,7 @@ paint_node_update_early(struct weston_paint_node *pnode)
struct weston_surface *surface = pnode->surface;
bool view_dirty = pnode->status & WESTON_PAINT_NODE_VIEW_DIRTY;
bool output_dirty = pnode->status & WESTON_PAINT_NODE_OUTPUT_DIRTY;
bool buffer_dirty = pnode->status & WESTON_PAINT_NODE_BUFFER_DIRTY;
bool recording_censor, unprotected_censor;
struct weston_buffer *buffer;
@ -258,9 +259,13 @@ paint_node_update_early(struct weston_paint_node *pnode)
get_placeholder_color(pnode, &pnode->solid);
}
if (buffer_dirty)
surface->compositor->renderer->attach(pnode);
pnode->output->paint_node_changes |= pnode->status;
pnode->status &= ~(WESTON_PAINT_NODE_VIEW_DIRTY | \
WESTON_PAINT_NODE_OUTPUT_DIRTY);
WESTON_PAINT_NODE_OUTPUT_DIRTY |
WESTON_PAINT_NODE_BUFFER_DIRTY);
}
/* This is for validating a paint node after early update, assign planes,
@ -305,7 +310,6 @@ paint_node_update_late(struct weston_paint_node *pnode)
struct weston_buffer *buffer = surf->buffer_ref.buffer;
bool vis_dirty = pnode->status & WESTON_PAINT_NODE_VISIBILITY_DIRTY;
bool plane_dirty = pnode->status & WESTON_PAINT_NODE_PLANE_DIRTY;
bool buffer_dirty = pnode->status & WESTON_PAINT_NODE_BUFFER_DIRTY;
/* The geoemtry may be shrinking, so we shouldn't just
* add the old visible region to our damage region, because
@ -353,12 +357,8 @@ paint_node_update_late(struct weston_paint_node *pnode)
get_placeholder_color(pnode, &pnode->solid);
}
if (buffer_dirty)
surf->compositor->renderer->attach(pnode);
pnode->status &= ~(WESTON_PAINT_NODE_VISIBILITY_DIRTY |
WESTON_PAINT_NODE_PLANE_DIRTY |
WESTON_PAINT_NODE_BUFFER_DIRTY);
WESTON_PAINT_NODE_PLANE_DIRTY);
paint_node_validate_ready(pnode);
}