Re: [PR PATCH] [Updated] mesa: update to 22.1.2.

[HadetTheUndying <HadetTheUndying@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]

There is an updated pull request by HadetTheUndying against master on the void-packages repository

https://github.com/HadetTheUndying/void-packages mesa-22.1.2
https://github.com/void-linux/void-packages/pull/37606

mesa: update to 22.1.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-glibc
  - aarch64-musl


A patch file from https://github.com/void-linux/void-packages/pull/37606.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-22.1.2-37606.patch --]
[-- Type: text/x-diff, Size: 4219 bytes --]

From a1991ae6380404eb29daceb4be8bf881992745d1 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 17 Jun 2022 16:02:16 -0500
Subject: [PATCH 1/3] mesa: update to 22.1.2.

---
 srcpkgs/mesa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index e57a4b116683..481a3ec15b63 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.1.1
+version=22.1.2
 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=46940865ffe794db73ac2bc7ab7ff2570042a0b61a8ac43ca1688863e2bc0ef1
+checksum=0971226b4a6a3d10cfc255736b33e4017e18c14c9db1e53863ac1f8ae0deb9ea
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From 2955037285d0395e2ca6ad002a2448e8ba990380 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 17 Jun 2022 16:49:10 -0500
Subject: [PATCH 2/3] mesa: Enable llvmpipe for i686*

---
 srcpkgs/mesa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 481a3ec15b63..79d1c638443f 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -32,7 +32,7 @@ fi
 # especially on big endian it's all kinds of broken, and e.g. on
 # 32-bit powerpc it does not work at all, so fall back to softpipe
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*|aarch64*|ppc64le*|arm*) ;;
+	i686*|x86_64*|aarch64*|ppc64le*|arm*) ;;
 	*) configure_args+=" -Ddraw-use-llvm=false" ;;
 esac
 

From 51ca407fcd99cfceb9ff30fdd76dc5edf7de44cd Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 17 Jun 2022 16:52:56 -0500
Subject: [PATCH 3/3] mesa: Re-add HoneyComb LX2K patch for aarch64*

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch

diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
new file mode 100644
index 000000000000..725a306ec30b
--- /dev/null
+++ b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
@@ -0,0 +1,39 @@
+https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
+
+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
+@@ -151,6 +151,10 @@ 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)
++      res->domains = RADEON_DOMAIN_GTT;
++#endif
+    }
+ 
+    /* Tiled textures are unmappable. Always put them in VRAM. */
+-- 
+2.26.2