diff options
| author | Daniel Stone <daniels@collabora.com> | 2018-04-04 16:16:37 +0100 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-04-04 13:46:57 -0400 |
| commit | 9c407f0a1b40128fc65b19b6a499f1d4dae6f702 (patch) | |
| tree | 8588cd2915ec5057471bd5c6948bdf9450a32ce1 /glamor | |
| parent | 86b2d8740a330deafe8a9bbf0402705a43efbb42 (diff) | |
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>
Diffstat (limited to 'glamor')
| -rw-r--r-- | glamor/glamor_egl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index a1e0bc3c9..2dffbb8dc 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -261,7 +261,7 @@ glamor_make_pixmap_exportable(PixmapPtr pixmap, Bool modifiers_ok) unsigned width = pixmap->drawable.width; unsigned height = pixmap->drawable.height; uint32_t format; - struct gbm_bo *bo; + struct gbm_bo *bo = NULL; Bool used_modifiers = FALSE; PixmapPtr exported; GCPtr scratch_gc; @@ -295,8 +295,9 @@ glamor_make_pixmap_exportable(PixmapPtr pixmap, Bool modifiers_ok) used_modifiers = TRUE; free(modifiers); } - else #endif + + if (!bo) { bo = gbm_bo_create(glamor_egl->gbm, width, height, format, #ifdef GLAMOR_HAS_GBM_LINEAR |