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

xwayland: Make helper for returning a list of formats 

This adds xwl_get_formats

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

[ Michel Dänzer:
* Remove unused variable i from xwl_glamor_get_formats ]
This commit is contained in:
Austin Shafer 2022-12-20 12:15:41 +01:00 committed by Michel Dänzer
parent d2e107b260
commit 43b35b4efe
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,12 +154,32 @@ xwl_screen_get_main_dev(struct xwl_screen *xwl_screen)
return xwl_screen->default_feedback.main_dev; return xwl_screen->default_feedback.main_dev;
} }
static Bool
xwl_get_formats(struct xwl_format *format_array, int format_array_len,
uint32_t *num_formats, uint32_t **formats)
{
*num_formats = 0;
*formats = NULL;
if (format_array_len == 0)
return TRUE;
*formats = calloc(format_array_len, sizeof(CARD32));
if (*formats == NULL)
return FALSE;
for (int i = 0; i < format_array_len; i++)
(*formats)[i] = format_array[i].format;
*num_formats = format_array_len;
return TRUE;
}
Bool Bool
xwl_glamor_get_formats(ScreenPtr screen, xwl_glamor_get_formats(ScreenPtr screen,
CARD32 *num_formats, CARD32 **formats) CARD32 *num_formats, CARD32 **formats)
{ {
struct xwl_screen *xwl_screen = xwl_screen_get(screen); struct xwl_screen *xwl_screen = xwl_screen_get(screen);
int i;
/* Explicitly zero the count as the caller may ignore the return value */ /* Explicitly zero the count as the caller may ignore the return value */
*num_formats = 0; *num_formats = 0;
@ -167,18 +187,8 @@ xwl_glamor_get_formats(ScreenPtr screen,
if (!xwl_screen->dmabuf) if (!xwl_screen->dmabuf)
return FALSE; return FALSE;
if (xwl_screen->num_formats == 0) return xwl_get_formats(xwl_screen->formats, xwl_screen->num_formats,
return TRUE; num_formats, formats);
*formats = calloc(xwl_screen->num_formats, sizeof(CARD32));
if (*formats == NULL)
return FALSE;
for (i = 0; i < xwl_screen->num_formats; i++)
(*formats)[i] = xwl_screen->formats[i].format;
*num_formats = xwl_screen->num_formats;
return TRUE;
} }
static Bool static Bool