frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xwayland: Drop xwl_window_buffers_get_pixmap() 

This just calls into xwl_window_swap_pixmap() so we can just use that
instead (Michel).

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1386>
This commit is contained in:
Olivier Fourdan 2024-03-12 16:48:59 +01:00 committed by Marge Bot
parent 656d2efd4b
commit 54a2dfc229
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xwayland/xwayland-window-buffers.c
View File

@ -396,9 +396,3 @@ xwl_window_swap_pixmap(struct xwl_window *xwl_window)
return xwl_window_buffer->pixmap; return xwl_window_buffer->pixmap;
} }
PixmapPtr
xwl_window_buffers_get_pixmap(struct xwl_window *xwl_window)
{
return xwl_window_swap_pixmap(xwl_window);
}

1
hw/xwayland/xwayland-window-buffers.h
View File

@ -38,6 +38,5 @@ void xwl_window_buffers_init(struct xwl_window *xwl_window);
void xwl_window_buffers_dispose(struct xwl_window *xwl_window); void xwl_window_buffers_dispose(struct xwl_window *xwl_window);
void xwl_window_realloc_pixmap(struct xwl_window *xwl_window); void xwl_window_realloc_pixmap(struct xwl_window *xwl_window);
PixmapPtr xwl_window_swap_pixmap(struct xwl_window *xwl_window); PixmapPtr xwl_window_swap_pixmap(struct xwl_window *xwl_window);
PixmapPtr xwl_window_buffers_get_pixmap(struct xwl_window *xwl_window);
#endif /* XWAYLAND_WINDOW_BUFFERS_H */ #endif /* XWAYLAND_WINDOW_BUFFERS_H */

2
hw/xwayland/xwayland-window.c
View File

@ -1349,7 +1349,7 @@ xwl_window_attach_buffer(struct xwl_window *xwl_window)
PixmapPtr pixmap; PixmapPtr pixmap;
int i; int i;
pixmap = xwl_window_buffers_get_pixmap(xwl_window); pixmap = xwl_window_swap_pixmap(xwl_window);
buffer = xwl_pixmap_get_wl_buffer(pixmap); buffer = xwl_pixmap_get_wl_buffer(pixmap);
if (!buffer) { if (!buffer) {