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

xwayland/glamor: Drop xwl_glamor_needs_n_buffering() 

This function always return TRUE now that EGLSTream is gone, so we can
remove it.

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:33:06 +01:00 committed by Marge Bot
parent d422b40926
commit 656d2efd4b
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xwayland/xwayland-glamor.c
View File

@ -269,12 +269,6 @@ glamor_egl_fd_name_from_pixmap(ScreenPtr screen,
return 0; return 0;
} }
Bool
xwl_glamor_needs_n_buffering(struct xwl_screen *xwl_screen)
{
return TRUE;
}
Bool Bool
xwl_glamor_init(struct xwl_screen *xwl_screen) xwl_glamor_init(struct xwl_screen *xwl_screen)
{ {

1
hw/xwayland/xwayland-glamor.h
View File

@ -55,7 +55,6 @@ void xwl_glamor_init_wl_registry(struct xwl_screen *xwl_screen,
uint32_t id, const char *interface, uint32_t id, const char *interface,
uint32_t version); uint32_t version);
void xwl_glamor_egl_make_current(struct xwl_screen *xwl_screen); void xwl_glamor_egl_make_current(struct xwl_screen *xwl_screen);
Bool xwl_glamor_needs_n_buffering(struct xwl_screen *xwl_screen);
Bool xwl_glamor_check_flip(WindowPtr present_window, PixmapPtr pixmap); Bool xwl_glamor_check_flip(WindowPtr present_window, PixmapPtr pixmap);
PixmapPtr xwl_glamor_create_pixmap_for_window (struct xwl_window *xwl_window); PixmapPtr xwl_glamor_create_pixmap_for_window (struct xwl_window *xwl_window);

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

@ -400,12 +400,5 @@ xwl_window_swap_pixmap(struct xwl_window *xwl_window)
PixmapPtr PixmapPtr
xwl_window_buffers_get_pixmap(struct xwl_window *xwl_window) xwl_window_buffers_get_pixmap(struct xwl_window *xwl_window)
{ {
#ifdef XWL_HAS_GLAMOR
struct xwl_screen *xwl_screen = xwl_window->xwl_screen;
if (!xwl_glamor_needs_n_buffering(xwl_screen))
return xwl_screen->screen->GetWindowPixmap(xwl_window->window);
#endif /* XWL_HAS_GLAMOR */
return xwl_window_swap_pixmap(xwl_window); return xwl_window_swap_pixmap(xwl_window);
} }