ahill/xlibre-xserver
1
0
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-01-26 14:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

glamor/glamor_egl.c: Report skipping all modifiers as failure

Browse Source 
If `glamor_get_modifiers` returns no modifiers, but succeeds, it means
that modifiers are implicit and chosen by the driver
(e.g. when allocating gbm buffers)

If we strip all modifiers however, it means that from the list
of modifiers we queried, we can use none.
This means that it would be an error to, for example,
create a gbm bo, create an image from it and try to
render into it.

We should treat this case as a failure.

Signed-off-by: stefan11111 <stefan11111@shitposting.expert>
This commit is contained in:
stefan11111 2026-01-06 01:12:12 +02:00 committed by Enrico Weigelt
parent d92a55c286
commit dc55d361d8
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
glamor/glamor_egl.c
View File

@ -389,7 +389,9 @@ glamor_make_pixmap_exportable(PixmapPtr pixmap, Bool modifiers_ok)
uint32_t num_modifiers;
uint64_t *modifiers = NULL;
glamor_get_modifiers(screen, format, &num_modifiers, &modifiers);
if (!glamor_get_modifiers(screen, format, &num_modifiers, &modifiers)) {
return FALSE;
}
if (num_modifiers > 0) {
#ifdef GBM_BO_WITH_MODIFIERS2
@ -892,6 +894,15 @@ glamor_get_modifiers(ScreenPtr screen, uint32_t format,
*num_modifiers = num;
glamor_filter_modifiers(num_modifiers, modifiers, external_only);
free(external_only);
if (num && *num_modifiers == 0) {
/**
* The api explicitly told us what the supported modifiers are,
* but we can't use any of them for our purposes
*/
return FALSE;
}
#endif
return TRUE;
}