isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland/shm: Advertise support for 64 half point RGBA formats

Browse Source 
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
This commit is contained in:
Jonas Ådahl 2019-09-18 18:38:22 +02:00 committed by Robert Mader
parent 8e673d5798
commit d3f629bfa8
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -42,7 +42,7 @@ udev_req = '>= 228'
gudev_req = '>= 232' gudev_req = '>= 232'
# wayland version requirements # wayland version requirements
wayland_server_req = '>= 1.13.0' wayland_server_req = '>= 1.18'
wayland_protocols_req = '>= 1.19' wayland_protocols_req = '>= 1.19'
# native backend version requirements # native backend version requirements

16
src/wayland/meta-wayland-buffer.c
View File

@ -229,6 +229,18 @@ shm_format_to_cogl_pixel_format (enum wl_shm_format shm_format,
case WL_SHM_FORMAT_ABGR2101010: case WL_SHM_FORMAT_ABGR2101010:
format = COGL_PIXEL_FORMAT_ABGR_2101010_PRE; format = COGL_PIXEL_FORMAT_ABGR_2101010_PRE;
break; 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 #endif
default: default:
return FALSE; return FALSE;
@ -776,6 +788,10 @@ meta_wayland_init_shm (MetaWaylandCompositor *compositor)
WL_SHM_FORMAT_XRGB2101010, WL_SHM_FORMAT_XRGB2101010,
WL_SHM_FORMAT_ABGR2101010, WL_SHM_FORMAT_ABGR2101010,
WL_SHM_FORMAT_XBGR2101010, WL_SHM_FORMAT_XBGR2101010,
WL_SHM_FORMAT_ARGB16161616F,
WL_SHM_FORMAT_XRGB16161616F,
WL_SHM_FORMAT_ABGR16161616F,
WL_SHM_FORMAT_XBGR16161616F,
#endif #endif
}; };
int i; int i;