summaryrefslogtreecommitdiff
path: root/src/wayland
diff options
context:
space:
mode:
authorJonas Ã…dahl <jadahl@gmail.com>2019-09-18 18:38:22 +0200
committerRobert Mader <robert.mader@posteo.de>2020-08-07 09:02:49 +0000
commitd3f629bfa8a7150e2f4d9a46ccfa8322875131f5 (patch)
treeec8696da253bd068d252cdf728fdf18d9e3f5c51 /src/wayland
parent8e673d5798049210d0afee31e130e112b260265e (diff)
downloadmutter-d3f629bfa8a7150e2f4d9a46ccfa8322875131f5.tar.gz
wayland/shm: Advertise support for 64 half point RGBA formats
Now that cogl understands them, hook wl_shm up so they can be used. This also bumps the wayland-server version dependency to 1.17.90, which corresponds to the master branch of wayland. The new formats will be available in 1.18.0. https://gitlab.gnome.org/GNOME/mutter/merge_requests/804
Diffstat (limited to 'src/wayland')
-rw-r--r--src/wayland/meta-wayland-buffer.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/wayland/meta-wayland-buffer.c b/src/wayland/meta-wayland-buffer.c
index 312fc26f9..0416edf87 100644
--- a/src/wayland/meta-wayland-buffer.c
+++ b/src/wayland/meta-wayland-buffer.c
@@ -229,6 +229,18 @@ shm_format_to_cogl_pixel_format (enum wl_shm_format shm_format,
case WL_SHM_FORMAT_ABGR2101010:
format = COGL_PIXEL_FORMAT_ABGR_2101010_PRE;
break;
+ case WL_SHM_FORMAT_XRGB16161616F:
+ components = COGL_TEXTURE_COMPONENTS_RGB;
+ G_GNUC_FALLTHROUGH;
+ case WL_SHM_FORMAT_ARGB16161616F:
+ format = COGL_PIXEL_FORMAT_BGRA_FP_16161616_PRE;
+ break;
+ case WL_SHM_FORMAT_XBGR16161616F:
+ components = COGL_TEXTURE_COMPONENTS_RGB;
+ G_GNUC_FALLTHROUGH;
+ case WL_SHM_FORMAT_ABGR16161616F:
+ format = COGL_PIXEL_FORMAT_RGBA_FP_16161616_PRE;
+ break;
#endif
default:
return FALSE;
@@ -776,6 +788,10 @@ meta_wayland_init_shm (MetaWaylandCompositor *compositor)
WL_SHM_FORMAT_XRGB2101010,
WL_SHM_FORMAT_ABGR2101010,
WL_SHM_FORMAT_XBGR2101010,
+ WL_SHM_FORMAT_ARGB16161616F,
+ WL_SHM_FORMAT_XRGB16161616F,
+ WL_SHM_FORMAT_ABGR16161616F,
+ WL_SHM_FORMAT_XBGR16161616F,
#endif
};
int i;