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

xwayland/glamor: Drop xwl_glamor_needs_buffer_flush() 

GLAMOR needs that, and the function returns TRUE unless GLAMOR is not
used.

Drop the function xwl_glamor_needs_buffer_flush() and call
glamor_block_handler() when glamor is used.

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:30:13 +01:00 committed by Marge Bot
parent 6466c1ee81
commit d422b40926
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,15 +269,6 @@ glamor_egl_fd_name_from_pixmap(ScreenPtr screen,
return 0;
}
Bool
xwl_glamor_needs_buffer_flush(struct xwl_screen *xwl_screen)
{
if (!xwl_screen->glamor)
return FALSE;
return TRUE;
}
Bool
xwl_glamor_needs_n_buffering(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 version);
void xwl_glamor_egl_make_current(struct xwl_screen *xwl_screen);
Bool xwl_glamor_needs_buffer_flush(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);
PixmapPtr xwl_glamor_create_pixmap_for_window (struct xwl_window *xwl_window);

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

@ -416,7 +416,7 @@ xwl_screen_post_damage(struct xwl_screen *xwl_screen)
return;
#ifdef XWL_HAS_GLAMOR
if (xwl_glamor_needs_buffer_flush(xwl_screen))
if (xwl_screen->glamor)
glamor_block_handler(xwl_screen->screen);
#endif