fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-06 12:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

compositor: Add a weston_coord_global_to_surface_for_paint_node and use it

Browse source 
Add compositor code to handle this so the gl-renderer can reference just
the paint_node.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2026-03-16 12:50:04 -05:00
parent f5fb552b57
commit 22bcfead57
3 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libweston/compositor.c
View file

@ -1093,6 +1093,20 @@ weston_coord_global_to_surface(struct weston_view *view,
return out;
}
WL_EXPORT struct weston_coord_surface
weston_coord_global_to_surface_for_paint_node(const struct weston_paint_node *pnode,
struct weston_coord_global coord)
{
struct weston_coord_surface out;
const struct weston_view *view = pnode->view;
assert(!view->transform.dirty);
out.c = weston_matrix_transform_coord(&view->transform.inverse,
coord.c);
out.coordinate_space_id = view->surface;
return out;
}
WL_EXPORT struct weston_coord_buffer
weston_coord_surface_to_buffer(const struct weston_surface *surface,
struct weston_coord_surface coord)

4
libweston/libweston-internal.h
View file

@ -895,4 +895,8 @@ void
weston_backend_clear_deferred(struct weston_backend *backend,
struct weston_compositor *compositor);
struct weston_coord_surface __attribute__ ((warn_unused_result))
weston_coord_global_to_surface_for_paint_node(const struct weston_paint_node *pnode,
struct weston_coord_global coord);
#endif

8
libweston/renderer-gl/gl-renderer.c
View file

@ -2157,7 +2157,7 @@ compress_bands(pixman_box32_t *inrects, int nrects, pixman_box32_t **outrects)
}
static void
global_to_surface(pixman_box32_t *rect, struct weston_view *ev,
global_to_surface(pixman_box32_t *rect, const struct weston_paint_node *pnode,
struct clipper_vertex polygon[4])
{
struct weston_coord_global rect_g[4] = {
@ -2170,7 +2170,7 @@ global_to_surface(pixman_box32_t *rect, struct weston_view *ev,
int i;
for (i = 0; i < 4; i++) {
rect_s = weston_coord_global_to_surface(ev, rect_g[i]).c;
rect_s = weston_coord_global_to_surface_for_paint_node(pnode, rect_g[i]).c;
polygon[i].x = (float)rect_s.x;
polygon[i].y = (float)rect_s.y;
}
@ -2192,7 +2192,6 @@ transform_damage(const struct weston_paint_node *pnode,
bool compress, axis_aligned;
struct clipper_quad *quads_alloc;
struct clipper_vertex polygon[4];
struct weston_view *view;
if (*quads)
return;
@ -2213,10 +2212,9 @@ transform_damage(const struct weston_paint_node *pnode,
* stores standard output transforms (translations, flips and rotations
* by 90°), then all the transformed quads are axis-aligned in surface
* space. */
view = pnode->view;
axis_aligned = pnode->valid_transform;
for (i = 0; i < nrects; i++) {
global_to_surface(&rects[i], view, polygon);
global_to_surface(&rects[i], pnode, polygon);
clipper_quad_init(&quads_alloc[i], polygon, axis_aligned);
}