KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

egl/wayland: Use visual map for format advertisement 

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Tested-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Daniel Stone 2018-02-06 10:20:39 +00:00
parent 3323ce72ff
commit 68a80c11bd
1 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/egl/drivers/dri2/platform_wayland.c
View File

@ -130,6 +130,19 @@ dri2_wl_visual_idx_from_config(struct dri2_egl_display *dri2_dpy,
return -1;
}
static int
dri2_wl_visual_idx_from_fourcc(uint32_t fourcc)
{
for (int i = 0; i < ARRAY_SIZE(dri2_wl_visuals); i++) {
/* wl_drm format codes overlap with DRIImage FourCC codes for all formats
* we support. */
if (dri2_wl_visuals[i].wl_drm_format == fourcc)
return i;
}
return -1;
}
static int
dri2_wl_visual_idx_from_dri_image_format(uint32_t dri_image_format)
{
@ -141,6 +154,17 @@ dri2_wl_visual_idx_from_dri_image_format(uint32_t dri_image_format)
return -1;
}
static int
dri2_wl_visual_idx_from_shm_format(uint32_t shm_format)
{
for (int i = 0; i < ARRAY_SIZE(dri2_wl_visuals); i++) {
if (dri2_wl_visuals[i].wl_shm_format == shm_format)
return i;
}
return -1;
}
static int
roundtrip(struct dri2_egl_display *dri2_dpy)
{
@ -1137,24 +1161,12 @@ static void
drm_handle_format(void *data, struct wl_drm *drm, uint32_t format)
{
struct dri2_egl_display *dri2_dpy = data;
int visual_idx = dri2_wl_visual_idx_from_fourcc(format);
switch (format) {
case WL_DRM_FORMAT_ARGB2101010:
dri2_dpy->formats |= HAS_ARGB2101010;
break;
case WL_DRM_FORMAT_XRGB2101010:
dri2_dpy->formats |= HAS_XRGB2101010;
break;
case WL_DRM_FORMAT_ARGB8888:
dri2_dpy->formats |= HAS_ARGB8888;
break;
case WL_DRM_FORMAT_XRGB8888:
dri2_dpy->formats |= HAS_XRGB8888;
break;
case WL_DRM_FORMAT_RGB565:
dri2_dpy->formats |= HAS_RGB565;
break;
}
if (visual_idx == -1)
return;
dri2_dpy->formats |= dri2_wl_visuals[visual_idx].has_format;
}
static void
@ -1193,6 +1205,7 @@ dmabuf_handle_modifier(void *data, struct zwp_linux_dmabuf_v1 *dmabuf,
uint32_t modifier_lo)
{
struct dri2_egl_display *dri2_dpy = data;
int visual_idx = dri2_wl_visual_idx_from_fourcc(format);
uint64_t *mod = NULL;
if (modifier_hi == (DRM_FORMAT_MOD_INVALID >> 32) &&
@ -1202,23 +1215,18 @@ dmabuf_handle_modifier(void *data, struct zwp_linux_dmabuf_v1 *dmabuf,
switch (format) {
case WL_DRM_FORMAT_ARGB2101010:
mod = u_vector_add(&dri2_dpy->wl_modifiers.argb2101010);
dri2_dpy->formats |= HAS_ARGB2101010;
break;
case WL_DRM_FORMAT_XRGB2101010:
mod = u_vector_add(&dri2_dpy->wl_modifiers.xrgb2101010);
dri2_dpy->formats |= HAS_XRGB2101010;
break;
case WL_DRM_FORMAT_ARGB8888:
mod = u_vector_add(&dri2_dpy->wl_modifiers.argb8888);
dri2_dpy->formats |= HAS_ARGB8888;
break;
case WL_DRM_FORMAT_XRGB8888:
mod = u_vector_add(&dri2_dpy->wl_modifiers.xrgb8888);
dri2_dpy->formats |= HAS_XRGB8888;
break;
case WL_DRM_FORMAT_RGB565:
mod = u_vector_add(&dri2_dpy->wl_modifiers.rgb565);
dri2_dpy->formats |= HAS_RGB565;
break;
default:
break;
@ -1227,6 +1235,7 @@ dmabuf_handle_modifier(void *data, struct zwp_linux_dmabuf_v1 *dmabuf,
if (!mod)
return;
dri2_dpy->formats |= dri2_wl_visuals[visual_idx].has_format;
*mod = (uint64_t) modifier_hi << 32;
*mod |= (uint64_t) (modifier_lo & 0xffffffff);
}
@ -1934,24 +1943,12 @@ static void
shm_handle_format(void *data, struct wl_shm *shm, uint32_t format)
{
struct dri2_egl_display *dri2_dpy = data;
int visual_idx = dri2_wl_visual_idx_from_shm_format(format);
switch (format) {
case WL_SHM_FORMAT_ARGB2101010:
dri2_dpy->formats |= HAS_ARGB2101010;
break;
case WL_SHM_FORMAT_XRGB2101010:
dri2_dpy->formats |= HAS_XRGB2101010;
break;
case WL_SHM_FORMAT_ARGB8888:
dri2_dpy->formats |= HAS_ARGB8888;
break;
case WL_SHM_FORMAT_XRGB8888:
dri2_dpy->formats |= HAS_XRGB8888;
break;
case WL_SHM_FORMAT_RGB565:
dri2_dpy->formats |= HAS_RGB565;
break;
}
if (visual_idx == -1)
return;
dri2_dpy->formats |= dri2_wl_visuals[visual_idx].has_format;
}
static const struct wl_shm_listener shm_listener = {