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

xwayland/glamor/gbm: Use helper for implicit buffer params too 

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
This commit is contained in:
Jonas Ådahl 2023-03-08 16:54:30 +01:00
parent af255b1651
commit 9bd83c02a8
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hw/xwayland/xwayland-glamor-gbm.c
View File

@ -395,6 +395,26 @@ init_buffer_params_with_modifiers(struct xwl_pixmap *xwl_pixmap,
return TRUE; return TRUE;
} }
#else
static Bool
init_buffer_params_fallback(struct xwl_pixmap *xwl_pixmap,
uint64_t *modifier,
int *num_planes,
int *prime_fds,
uint32_t *strides,
uint32_t *offsets)
{
*num_planes = 1;
*modifier = DRM_FORMAT_MOD_INVALID;
prime_fds[0] = gbm_bo_get_fd(xwl_pixmap->bo);
if (prime_fds[0] == -1)
return FALSE;
strides[0] = gbm_bo_get_stride(xwl_pixmap->bo);
offsets[0] = 0;
return TRUE;
}
#endif #endif
static struct wl_buffer * static struct wl_buffer *
@ -435,13 +455,13 @@ xwl_glamor_gbm_get_wl_buffer_for_pixmap(PixmapPtr pixmap)
offsets)) offsets))
return NULL; return NULL;
#else #else
num_planes = 1; if (!init_buffer_params_fallback(xwl_pixmap,
modifier = DRM_FORMAT_MOD_INVALID; &modifier,
prime_fds[0] = gbm_bo_get_fd(xwl_pixmap->bo); &num_planes,
if (prime_fds[0] == -1) prime_fds,
strides,
offsets))
return NULL; return NULL;
strides[0] = gbm_bo_get_stride(xwl_pixmap->bo);
offsets[0] = 0;
#endif #endif
if (xwl_screen->dmabuf && if (xwl_screen->dmabuf &&