mesa: update to 22.1.1.

srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch

@@ -1,38 +0,0 @@
-From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
-From: Jon Nettleton <jon@solid-run.com>
-Date: Fri, 14 Aug 2020 13:36:08 +0200
-Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
-
-This fixes a glamore corruption issue on the HoneyComb and by
-internet reports should also fix problems seen on Huaweii
-Kunpeng hardware.
-
-The root cause of the corruption needs to be worked out, but
-this patch also adds a noticable performance improvement. The
-aquarium webgl demo under chromium increases from 39-49 FPS
-when 5000 fish being rendered is selected.  Glmark scores also
-improve by ~200 with no specific tests showing any regression.
-
-Signed-off-by: Jon Nettleton <jon@solid-run.com>
----
- src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
-index 6b58aebee2d..c9e983367a0 100644
---- a/src/gallium/drivers/radeonsi/si_buffer.c
-+++ b/src/gallium/drivers/radeonsi/si_buffer.c
-@@ -100,6 +100,11 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
-        */
-       if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
-          res->domains = RADEON_DOMAIN_GTT;
-+
-+#if defined(PIPE_ARCH_AARCH64)
-+      if (size <= 1024 * 1024)
-+         res->domains = RADEON_DOMAIN_GTT;
-+#endif
-    }
- 
-    /* Tiled textures are unmappable. Always put them in VRAM. */
--- 
-2.26.2

srcpkgs/mesa/patches/add-use-elf-tls.patch

@@ -1,22 +1,21 @@
 Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
 Status: Not fixed upstream
+--- a/meson.build  2022-05-02 16:58:59.796354436 -0400
++++ b/meson.build  2022-05-02 17:07:49.628310289 -0400
+@@ -490,8 +490,11 @@
+   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
+ endforeach
 
-diff --git meson.build meson.build
-index e1e94e71049..96ab3fb3e45 100644
---- a/meson.build
-+++ b/meson.build
-@@ -447,7 +447,8 @@ endif
- 
- # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
- use_elf_tls = false
--if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and
-+with_use_elf_tls = get_option('use-elf-tls')
-+if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and with_use_elf_tls and
-     (not with_platform_android or get_option('platform-sdk-version') >= 29) and
-     (not with_platform_windows or not with_shared_glapi))
-   pre_args += '-DUSE_ELF_TLS'
-diff --git meson_options.txt meson_options.txt
-index a7030aba31e..966cfeca298 100644
+-use_elf_tls = true
+-pre_args += '-DUSE_ELF_TLS'
++#use_elf_tls = true
++use_elf_tls = get_option('use-elf-tls')
++if use_elf_tls
++  pre_args += '-DUSE_ELF_TLS'
++endif
+
+ if with_platform_android and get_option('platform-sdk-version') >= 29
+   # By default the NDK compiler, at least, emits emutls references instead of
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -446,6 +446,12 @@ option(

srcpkgs/mesa/template

@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.3.7
+version=22.1.1
 revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
@@ -22,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d
+checksum=46940865ffe794db73ac2bc7ab7ff2570042a0b61a8ac43ca1688863e2bc0ef1
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -83,7 +83,6 @@ if [ "$_have_amd" ]; then
 	_have_vulkan=yes
 	_gallium_drivers+=",r300,r600,radeonsi"
 	_vulkan_drivers+=",amd"
-	_dri_drivers+=",r100,r200"
 	subpackages+=" mesa-vulkan-radeon"
 	# transitional dummy packages
 	subpackages+=" mesa-ati-dri"
@@ -91,9 +90,8 @@ fi
 
 if [ "$_have_intel" ]; then
 	_have_vulkan=yes
-	_gallium_drivers+=",crocus,iris"
+	_gallium_drivers+=",crocus,iris,i915"
 	_vulkan_drivers+=",intel"
-	_dri_drivers+=",i915,i965"
 	subpackages+=" mesa-vulkan-intel"
 	# transitional dummy packages
 	subpackages+=" mesa-intel-dri"
@@ -105,8 +103,6 @@ if [ "$_have_nv" ]; then
 		_gallium_drivers+=",tegra"
 		# transitional dummy packages
 		subpackages+=" mesa-tegra-dri"
-	else
-		_dri_drivers+=",nouveau"
 	fi
 	# transitional dummy packages
 	subpackages+=" mesa-nouveau-dri"