diff options
| author | Olivier Fourdan <ofourdan@redhat.com> | 2024-03-12 11:21:57 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-03-18 15:41:17 +0000 |
| commit | 76ae669327039a93f0728392d2f07a4c17f5e410 (patch) | |
| tree | e0e372fe815bf65f5b8288fb5de0554963339487 /hw/xwayland | |
| parent | e60e00ff40a3d7fc76a8c523ce5da143c72cc27d (diff) | |
xwayland/glamor: Drop the get_wl_buffer_for_pixmap() hook
And rename the GLAMOR GBM xwl_glamor_gbm_get_wl_buffer_for_pixmap()
function as xwl_glamor_pixmap_get_wl_buffer().
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1386>
Diffstat (limited to 'hw/xwayland')
| -rw-r--r-- | hw/xwayland/xwayland-glamor-gbm.c | 5 | ||||
| -rw-r--r-- | hw/xwayland/xwayland-glamor.c | 11 |
2 files changed, 2 insertions, 14 deletions
diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c index 69c8ff97a..c07926ce5 100644 --- a/hw/xwayland/xwayland-glamor-gbm.c +++ b/hw/xwayland/xwayland-glamor-gbm.c @@ -511,8 +511,8 @@ init_buffer_params_fallback(struct xwl_pixmap *xwl_pixmap, return TRUE; } -static struct wl_buffer * -xwl_glamor_gbm_get_wl_buffer_for_pixmap(PixmapPtr pixmap) +struct wl_buffer * +xwl_glamor_pixmap_get_wl_buffer(PixmapPtr pixmap) { struct xwl_screen *xwl_screen = xwl_screen_get(pixmap->drawable.pScreen); struct xwl_pixmap *xwl_pixmap = xwl_pixmap_get(pixmap); @@ -1301,7 +1301,6 @@ xwl_glamor_init_gbm(struct xwl_screen *xwl_screen) dixSetPrivate(&xwl_screen->screen->devPrivates, &xwl_gbm_private_key, xwl_gbm); - xwl_screen->gbm_backend.get_wl_buffer_for_pixmap = xwl_glamor_gbm_get_wl_buffer_for_pixmap; xwl_screen->gbm_backend.check_flip = NULL; xwl_screen->gbm_backend.get_main_device = xwl_gbm_get_main_device; xwl_screen->gbm_backend.is_available = TRUE; diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c index c77a0c7f8..dc4f93993 100644 --- a/hw/xwayland/xwayland-glamor.c +++ b/hw/xwayland/xwayland-glamor.c @@ -130,17 +130,6 @@ xwl_glamor_has_wl_interfaces(struct xwl_screen *xwl_screen, return TRUE; } -struct wl_buffer * -xwl_glamor_pixmap_get_wl_buffer(PixmapPtr pixmap) -{ - struct xwl_screen *xwl_screen = xwl_screen_get(pixmap->drawable.pScreen); - - if (xwl_screen->egl_backend->get_wl_buffer_for_pixmap) - return xwl_screen->egl_backend->get_wl_buffer_for_pixmap(pixmap); - - return NULL; -} - Bool xwl_glamor_post_damage(struct xwl_window *xwl_window, PixmapPtr pixmap) |