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

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

12
hw/xwayland/xwayland-dmabuf.c
View File

@ -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 static Bool
xwl_dmabuf_get_formats(struct xwl_format *format_array, int format_array_len, xwl_dmabuf_get_formats(struct xwl_format *format_array, int format_array_len,
CARD32 *num_formats, CARD32 **formats) CARD32 *num_formats, CARD32 **formats)
@ -248,7 +242,7 @@ xwl_glamor_get_formats(ScreenPtr screen,
return FALSE; return FALSE;
if (xwl_screen->dmabuf_protocol_version >= 4) { 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, return xwl_dmabuf_get_formats_for_device(&xwl_screen->default_feedback, main_dev,
num_formats, formats); num_formats, formats);
@ -334,7 +328,7 @@ xwl_glamor_get_modifiers(ScreenPtr screen, uint32_t format,
return FALSE; return FALSE;
if (xwl_screen->dmabuf_protocol_version >= 4) { 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, return xwl_dmabuf_get_modifiers_for_device(&xwl_screen->default_feedback, main_dev,
format, num_modifiers, modifiers, NULL); format, num_modifiers, modifiers, NULL);
@ -373,7 +367,7 @@ xwl_glamor_get_drawable_modifiers_and_scanout(DrawablePtr drawable,
if (!xwl_window) if (!xwl_window)
return FALSE; 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, return xwl_dmabuf_get_modifiers_for_device(&xwl_window->feedback, main_dev,
format, num_modifiers, modifiers, format, num_modifiers, modifiers,