Merge branch 'x11-shm-readback-fallback' into 'master'

backend/x11: add SHM readback fallback when buffer import fails

See merge request wlroots/wlroots!5291
This commit is contained in:
Jonathan Marler 2026-04-07 21:21:50 +00:00
commit f4bee20858
3 changed files with 176 additions and 5 deletions

View file

@ -474,9 +474,11 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_event_loop *loop,
xcb_shm_query_version_reply_t *shm_reply =
xcb_shm_query_version_reply(x11->xcb, shm_cookie, NULL);
if (shm_reply) {
if (shm_reply->major_version >= 1 || shm_reply->minor_version >= 2) {
if (shm_reply->major_version > 1 ||
(shm_reply->major_version == 1 && shm_reply->minor_version >= 2)) {
x11->have_shm = true;
if (shm_reply->shared_pixmaps) {
x11->have_shm = true;
x11->have_shm_pixmaps = true;
} else {
wlr_log(WLR_INFO, "X11 does not support shared pixmaps");
}