From ef75ede4edf1f603a25e291cee15ae5706a5147c Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Wed, 25 Nov 2020 14:07:34 +0100 Subject: [PATCH] egl/wayland: remove libwayland < 1.18 workaround Require libwayland 1.18 and remove the workaround for WL_SHM_FORMAT_{A,X}BGR16161616F. Signed-off-by: Simon Ser Reviewed-by: Daniel Stone Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/container/x86_build.sh | 2 +- meson.build | 4 ++-- src/egl/drivers/dri2/platform_wayland.c | 7 ------- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f5c10a004a..23f1f86083b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -265,7 +265,7 @@ x86_build: extends: - .use-x86_build-base variables: - MESA_IMAGE_TAG: &x86_build "2020-12-02" + MESA_IMAGE_TAG: &x86_build "2020-12-09" .use-x86_build: variables: diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh index 4dce8cfe78b..d921e4bb33b 100644 --- a/.gitlab-ci/container/x86_build.sh +++ b/.gitlab-ci/container/x86_build.sh @@ -60,7 +60,7 @@ export WAYLAND_RELEASES=https://wayland.freedesktop.org/releases export XORGMACROS_VERSION=util-macros-1.19.0 export XCBPROTO_VERSION=xcb-proto-1.13 export LIBXCB_VERSION=libxcb-1.13 -export LIBWAYLAND_VERSION=wayland-1.17.0 +export LIBWAYLAND_VERSION=wayland-1.18.0 export WAYLAND_PROTOCOLS_VERSION=wayland-protocols-1.12 wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2 diff --git a/meson.build b/meson.build index 7e14e304789..60c9fc209fe 100644 --- a/meson.build +++ b/meson.build @@ -1769,8 +1769,8 @@ if with_platform_wayland wl_scanner_arg = 'code' endif dep_wl_protocols = dependency('wayland-protocols', version : '>= 1.8') - dep_wayland_client = dependency('wayland-client', version : '>=1.11') - dep_wayland_server = dependency('wayland-server', version : '>=1.11') + dep_wayland_client = dependency('wayland-client', version : '>=1.18') + dep_wayland_server = dependency('wayland-server', version : '>=1.18') if with_egl dep_wayland_egl = dependency('wayland-egl-backend', version : '>= 3') dep_wayland_egl_headers = dep_wayland_egl.partial_dependency(compile_args : true) diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index c0b26c4b623..f65d9e45d8f 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -50,13 +50,6 @@ #include "wayland-drm-client-protocol.h" #include "linux-dmabuf-unstable-v1-client-protocol.h" -/* cheesy workaround until wayland 1.18 is released */ -#if WAYLAND_VERSION_MAJOR > 1 || \ - (WAYLAND_VERSION_MAJOR == 1 && WAYLAND_VERSION_MINOR < 18) -#define WL_SHM_FORMAT_ABGR16161616F 0x48344241 -#define WL_SHM_FORMAT_XBGR16161616F 0x48344258 -#endif - /* * The index of entries in this table is used as a bitmask in * dri2_dpy->formats, which tracks the formats supported by our server.