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

xwayland: Add proper support for telling if a format/mod is supported 

This adds to xwl_glamor_is_modifier_supported, where if feedback
is in use we will check that the format/mod is allowed in any
device advertised by the compositor.

Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>

[ Michel Dänzer:
* Move dev_formats declaration to where it's used in
  xwl_feedback_is_modifier_supported
* Add curly braces around multi-line statement in
  xwl_glamor_is_modifier_supported ]
This commit is contained in:
Austin Shafer 2022-12-20 12:22:45 +01:00 committed by Michel Dänzer
parent d61eb4dd98
commit f0415beb9f
1 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,16 +97,16 @@ xwl_glamor_check_flip(PixmapPtr pixmap)
return TRUE;
}
Bool
xwl_glamor_is_modifier_supported(struct xwl_screen *xwl_screen,
uint32_t format, uint64_t modifier)
static Bool
xwl_glamor_is_modifier_supported_in_formats(struct xwl_format *formats, int num_formats,
uint32_t format, uint64_t modifier)
{
struct xwl_format *xwl_format = NULL;
int i;
for (i = 0; i < xwl_screen->num_formats; i++) {
if (xwl_screen->formats[i].format == format) {
xwl_format = &xwl_screen->formats[i];
for (i = 0; i < num_formats; i++) {
if (formats[i].format == format) {
xwl_format = &formats[i];
break;
}
}
@ -122,6 +122,52 @@ xwl_glamor_is_modifier_supported(struct xwl_screen *xwl_screen,
return FALSE;
}
static Bool
xwl_feedback_is_modifier_supported(struct xwl_dmabuf_feedback *xwl_feedback,
uint32_t format, uint64_t modifier)
{
for (int i = 0; i < xwl_feedback->dev_formats_len; i++) {
struct xwl_device_formats *dev_formats = &xwl_feedback->dev_formats[i];
if (xwl_glamor_is_modifier_supported_in_formats(dev_formats->formats,
dev_formats->num_formats,
format, modifier))
return TRUE;
}
return FALSE;
}
Bool
xwl_glamor_is_modifier_supported(struct xwl_screen *xwl_screen,
uint32_t format, uint64_t modifier)
{
struct xwl_window *xwl_window;
/*
* If we are using dmabuf v4, then we need to check in the main
* device and per-window format lists. For older protocol
* versions we can just check the list returned by the dmabuf.modifier
* events in xwl_screen
*/
if (xwl_screen->dmabuf_protocol_version < 4) {
return xwl_glamor_is_modifier_supported_in_formats(xwl_screen->formats,
xwl_screen->num_formats,
format, modifier);
}
if (xwl_feedback_is_modifier_supported(&xwl_screen->default_feedback, format, modifier))
return TRUE;
xorg_list_for_each_entry(xwl_window, &xwl_screen->window_list, link_window) {
if (xwl_feedback_is_modifier_supported(&xwl_window->feedback, format, modifier))
return TRUE;
}
return FALSE;
}
uint32_t
wl_drm_format_for_depth(int depth)
{