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

xwayland/glamor: Drop the create_pixmap_for_window() hook 

And rename the function xwl_glamor_gbm_create_pixmap_for_window() as
xwl_glamor_create_pixmap_for_window().

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 11:45:44 +01:00 committed by Marge Bot
parent 439c0ee5e4
commit 925a218b4b
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/xwayland/xwayland-glamor-gbm.c
View File

@ -402,13 +402,17 @@ xwl_glamor_gbm_create_pixmap(ScreenPtr screen,
width, height, depth, hint, FALSE); width, height, depth, hint, FALSE);
} }
static PixmapPtr PixmapPtr
xwl_glamor_gbm_create_pixmap_for_window(struct xwl_window *xwl_window) xwl_glamor_create_pixmap_for_window(struct xwl_window *xwl_window)
{ {
struct xwl_screen *xwl_screen = xwl_window->xwl_screen;
WindowPtr window = xwl_window->window; WindowPtr window = xwl_window->window;
unsigned border_width = 2 * window->borderWidth; unsigned border_width = 2 * window->borderWidth;
return xwl_glamor_gbm_create_pixmap_internal(xwl_window->xwl_screen, if (!xwl_screen->glamor || !xwl_screen->egl_backend)
return NullPixmap;
return xwl_glamor_gbm_create_pixmap_internal(xwl_screen,
&window->drawable, &window->drawable,
window->drawable.width + border_width, window->drawable.width + border_width,
window->drawable.height + border_width, window->drawable.height + border_width,
@ -1304,5 +1308,4 @@ xwl_glamor_init_gbm(struct xwl_screen *xwl_screen)
xwl_screen->gbm_backend.is_available = TRUE; xwl_screen->gbm_backend.is_available = TRUE;
xwl_screen->gbm_backend.backend_flags = XWL_EGL_BACKEND_NEEDS_BUFFER_FLUSH | xwl_screen->gbm_backend.backend_flags = XWL_EGL_BACKEND_NEEDS_BUFFER_FLUSH |
XWL_EGL_BACKEND_NEEDS_N_BUFFERING; XWL_EGL_BACKEND_NEEDS_N_BUFFERING;
xwl_screen->gbm_backend.create_pixmap_for_window = xwl_glamor_gbm_create_pixmap_for_window;
} }

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

@ -315,20 +315,6 @@ xwl_glamor_needs_n_buffering(struct xwl_screen *xwl_screen)
XWL_EGL_BACKEND_NEEDS_N_BUFFERING); XWL_EGL_BACKEND_NEEDS_N_BUFFERING);
} }
PixmapPtr
xwl_glamor_create_pixmap_for_window(struct xwl_window *xwl_window)
{
struct xwl_screen *xwl_screen = xwl_window->xwl_screen;
if (!xwl_screen->glamor || !xwl_screen->egl_backend)
return NullPixmap;
if (xwl_screen->egl_backend->create_pixmap_for_window)
return xwl_screen->egl_backend->create_pixmap_for_window(xwl_window);
else
return NullPixmap;
}
void void
xwl_glamor_init_backends(struct xwl_screen *xwl_screen) xwl_glamor_init_backends(struct xwl_screen *xwl_screen)
{ {