From 6466c1ee81c5e82a1e5add13fcb07bb2ef6141c2 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Tue, 12 Mar 2024 16:26:42 +0100 Subject: [PATCH] xwayland/glamor: Drop xwl_screen_get_main_dev() This is made redundant with xwl_gbm_get_main_device(), and this is not really an xwl_screen function either. Let's remove it. Signed-off-by: Olivier Fourdan Part-of: --- hw/xwayland/xwayland-dmabuf.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/hw/xwayland/xwayland-dmabuf.c b/hw/xwayland/xwayland-dmabuf.c index 7133922dc..4897c2708 100644 --- a/hw/xwayland/xwayland-dmabuf.c +++ b/hw/xwayland/xwayland-dmabuf.c @@ -169,12 +169,6 @@ wl_drm_format_for_depth(int depth) } } -static drmDevice * -xwl_screen_get_main_dev(struct xwl_screen *xwl_screen) -{ - return xwl_gbm_get_main_device(xwl_screen); -} - static Bool xwl_dmabuf_get_formats(struct xwl_format *format_array, int format_array_len, CARD32 *num_formats, CARD32 **formats) @@ -248,7 +242,7 @@ xwl_glamor_get_formats(ScreenPtr screen, return FALSE; if (xwl_screen->dmabuf_protocol_version >= 4) { - drmDevice *main_dev = xwl_screen_get_main_dev(xwl_screen); + drmDevice *main_dev = xwl_gbm_get_main_device(xwl_screen); return xwl_dmabuf_get_formats_for_device(&xwl_screen->default_feedback, main_dev, num_formats, formats); @@ -334,7 +328,7 @@ xwl_glamor_get_modifiers(ScreenPtr screen, uint32_t format, return FALSE; if (xwl_screen->dmabuf_protocol_version >= 4) { - main_dev = xwl_screen_get_main_dev(xwl_screen); + main_dev = xwl_gbm_get_main_device(xwl_screen); return xwl_dmabuf_get_modifiers_for_device(&xwl_screen->default_feedback, main_dev, format, num_modifiers, modifiers, NULL); @@ -373,7 +367,7 @@ xwl_glamor_get_drawable_modifiers_and_scanout(DrawablePtr drawable, if (!xwl_window) return FALSE; - main_dev = xwl_screen_get_main_dev(xwl_screen); + main_dev = xwl_gbm_get_main_device(xwl_screen); return xwl_dmabuf_get_modifiers_for_device(&xwl_window->feedback, main_dev, format, num_modifiers, modifiers,