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

glamor: Fall back to non-modifier allocations 

If we try to allocate with particular modifiers but it fails, try to
fall back to non-modifier allocations.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reported-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Daniel Stone 2018-04-04 16:16:37 +01:00 committed by Adam Jackson
parent 86b2d8740a
commit 9c407f0a1b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glamor/glamor_egl.c
View File

@ -261,7 +261,7 @@ glamor_make_pixmap_exportable(PixmapPtr pixmap, Bool modifiers_ok)
unsigned width = pixmap->drawable.width; unsigned width = pixmap->drawable.width;
unsigned height = pixmap->drawable.height; unsigned height = pixmap->drawable.height;
uint32_t format; uint32_t format;
struct gbm_bo *bo; struct gbm_bo *bo = NULL;
Bool used_modifiers = FALSE; Bool used_modifiers = FALSE;
PixmapPtr exported; PixmapPtr exported;
GCPtr scratch_gc; GCPtr scratch_gc;
@ -295,8 +295,9 @@ glamor_make_pixmap_exportable(PixmapPtr pixmap, Bool modifiers_ok)
used_modifiers = TRUE; used_modifiers = TRUE;
free(modifiers); free(modifiers);
} }
else
#endif #endif
if (!bo)
{ {
bo = gbm_bo_create(glamor_egl->gbm, width, height, format, bo = gbm_bo_create(glamor_egl->gbm, width, height, format,
#ifdef GLAMOR_HAS_GBM_LINEAR #ifdef GLAMOR_HAS_GBM_LINEAR