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

xwayland: Add xwl_glamor_get_drawable_modifiers_and_scanout() 

Add a new API similar to xwl_glamor_get_drawable_modifiers() but also
returning whether the format and modifiers are from a tranche which
supports scanout.

This is preparation work for adding scanout support with
gbm_bo_create_with_modifiers2() when supported.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
This commit is contained in:
Olivier Fourdan 2023-04-07 11:03:14 +02:00
parent f31ca9238f
commit 967ad0fa1e
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -327,7 +327,8 @@ xwl_get_modifiers_for_format(struct xwl_format *format_array, int num_formats,
static Bool static Bool
xwl_get_modifiers_for_device(struct xwl_dmabuf_feedback *feedback, drmDevice *device, xwl_get_modifiers_for_device(struct xwl_dmabuf_feedback *feedback, drmDevice *device,
uint32_t format, uint32_t *num_modifiers, uint32_t format, uint32_t *num_modifiers,
uint64_t **modifiers) uint64_t **modifiers,
Bool *supports_scanout)
{ {
/* Now try to find a matching set of tranches for the window's device */ /* Now try to find a matching set of tranches for the window's device */
for (int i = 0; i < feedback->dev_formats_len; i++) { for (int i = 0; i < feedback->dev_formats_len; i++) {
@ -335,9 +336,12 @@ xwl_get_modifiers_for_device(struct xwl_dmabuf_feedback *feedback, drmDevice *de
if (drmDevicesEqual(dev_formats->drm_dev, device) && if (drmDevicesEqual(dev_formats->drm_dev, device) &&
xwl_get_modifiers_for_format(dev_formats->formats, dev_formats->num_formats, xwl_get_modifiers_for_format(dev_formats->formats, dev_formats->num_formats,
format, num_modifiers, modifiers)) format, num_modifiers, modifiers)) {
if (supports_scanout)
*supports_scanout = !!dev_formats->supports_scanout;
return TRUE; return TRUE;
} }
}
return FALSE; return FALSE;
} }
@ -360,7 +364,8 @@ xwl_glamor_get_modifiers(ScreenPtr screen, uint32_t format,
main_dev = xwl_screen_get_main_dev(xwl_screen); main_dev = xwl_screen_get_main_dev(xwl_screen);
return xwl_get_modifiers_for_device(&xwl_screen->default_feedback, main_dev, return xwl_get_modifiers_for_device(&xwl_screen->default_feedback, main_dev,
format, num_modifiers, modifiers); format, num_modifiers, modifiers,
NULL);
} else { } else {
return xwl_get_modifiers_for_format(xwl_screen->formats, xwl_screen->num_formats, return xwl_get_modifiers_for_format(xwl_screen->formats, xwl_screen->num_formats,
format, num_modifiers, modifiers); format, num_modifiers, modifiers);
@ -368,8 +373,11 @@ xwl_glamor_get_modifiers(ScreenPtr screen, uint32_t format,
} }
Bool Bool
xwl_glamor_get_drawable_modifiers(DrawablePtr drawable, uint32_t format, xwl_glamor_get_drawable_modifiers_and_scanout(DrawablePtr drawable,
uint32_t *num_modifiers, uint64_t **modifiers) uint32_t format,
uint32_t *num_modifiers,
uint64_t **modifiers,
Bool *supports_scanout)
{ {
struct xwl_screen *xwl_screen = xwl_screen_get(drawable->pScreen); struct xwl_screen *xwl_screen = xwl_screen_get(drawable->pScreen);
struct xwl_window *xwl_window; struct xwl_window *xwl_window;
@ -377,6 +385,8 @@ xwl_glamor_get_drawable_modifiers(DrawablePtr drawable, uint32_t format,
*num_modifiers = 0; *num_modifiers = 0;
*modifiers = NULL; *modifiers = NULL;
if (supports_scanout)
*supports_scanout = FALSE;
/* We can only return per-drawable modifiers if the compositor supports feedback */ /* We can only return per-drawable modifiers if the compositor supports feedback */
if (xwl_screen->dmabuf_protocol_version < 4) if (xwl_screen->dmabuf_protocol_version < 4)
@ -394,7 +404,18 @@ xwl_glamor_get_drawable_modifiers(DrawablePtr drawable, uint32_t format,
main_dev = xwl_screen_get_main_dev(xwl_screen); main_dev = xwl_screen_get_main_dev(xwl_screen);
return xwl_get_modifiers_for_device(&xwl_window->feedback, main_dev, return xwl_get_modifiers_for_device(&xwl_window->feedback, main_dev,
format, num_modifiers, modifiers); format, num_modifiers, modifiers,
supports_scanout);
}
Bool
xwl_glamor_get_drawable_modifiers(DrawablePtr drawable, uint32_t format,
uint32_t *num_modifiers, uint64_t **modifiers)
{
return xwl_glamor_get_drawable_modifiers_and_scanout(drawable,
format, num_modifiers,
modifiers, NULL);
} }

5
hw/xwayland/xwayland-glamor.h
View File

@ -142,6 +142,11 @@ Bool xwl_glamor_get_formats(ScreenPtr screen,
CARD32 *num_formats, CARD32 **formats); CARD32 *num_formats, CARD32 **formats);
Bool xwl_glamor_get_modifiers(ScreenPtr screen, uint32_t format, Bool xwl_glamor_get_modifiers(ScreenPtr screen, uint32_t format,
uint32_t *num_modifiers, uint64_t **modifiers); uint32_t *num_modifiers, uint64_t **modifiers);
Bool xwl_glamor_get_drawable_modifiers_and_scanout(DrawablePtr drawable,
uint32_t format,
uint32_t *num_modifiers,
uint64_t **modifiers,
Bool *supports_scanout);
Bool xwl_glamor_get_drawable_modifiers(DrawablePtr drawable, uint32_t format, Bool xwl_glamor_get_drawable_modifiers(DrawablePtr drawable, uint32_t format,
uint32_t *num_modifiers, uint64_t **modifiers); uint32_t *num_modifiers, uint64_t **modifiers);
Bool xwl_glamor_check_flip(PixmapPtr pixmap); Bool xwl_glamor_check_flip(PixmapPtr pixmap);