Github messages for voidlinux
 help / color / mirror / Atom feed
From: zlice <zlice@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] mesa: update to 22.0.3.
Date: Sat, 21 May 2022 16:42:02 +0200	[thread overview]
Message-ID: <20220521144202.QuHCY1Tgm1PG6otRBhPseTJ0rJUtXOTqwpi9CRT4oKk@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36961@inbox.vuxu.org>

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

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

https://github.com/zlice/void-packages meas_22.0.2
https://github.com/void-linux/void-packages/pull/36961

mesa: update to 22.0.3.
#### Testing the changes
- I tested the changes in this PR: **YES**

Performance seems better? May be placebo.

#### Local build testing
- I built this PR locally for my native architecture, x86_64


#### Comments

Tested this on Intel i7-6700k iGPU and AMD 5700. It looks like older cards are being dropped and the build complains about some "amber" branch? Project "amber"? I don't know what that is in Mesa land. Looks like i915/i965 are dropped but my 6700k said it was using 'iris' graphics. [Gentoo's wiki](https://wiki.gentoo.org/wiki/Intel) has a table that shows Haswell (Intel 4xxx CPUs) are the last to not support iris driver.

I'm sure there are people who know way more than me about Mesa's changes. Just figured I'd put this here since it seems to be working.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meas_22.0.2-36961.patch --]
[-- Type: text/x-diff, Size: 7013 bytes --]

From e476e99ef2733da52acf6937c3e6ef12e9eb7567 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 2 May 2022 17:14:46 -0400
Subject: [PATCH] mesa: update to 22.0.4

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 38 -------------------
 srcpkgs/mesa/patches/add-use-elf-tls.patch    | 33 ++++++++--------
 .../mesa/patches/megadriver-symlinks.patch    | 25 ------------
 srcpkgs/mesa/template                         | 10 ++---
 4 files changed, 18 insertions(+), 88 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
 delete mode 100644 srcpkgs/mesa/patches/megadriver-symlinks.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
deleted file mode 100644
index 125e36f5e2f5..000000000000
--- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+++ /dev/null
@@ -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
diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-use-elf-tls.patch
index 420665ea8377..e38a6a4bbf31 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-use-elf-tls.patch
@@ -1,22 +1,19 @@
-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(
diff --git a/srcpkgs/mesa/patches/megadriver-symlinks.patch b/srcpkgs/mesa/patches/megadriver-symlinks.patch
deleted file mode 100644
index c19c42719422..000000000000
--- a/srcpkgs/mesa/patches/megadriver-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This converts megadriver installation to use symlinks so that we do
-not have to deal with skipping the strip stage for some files, as
-a result simplifying our template greatly.
-
---- a/bin/install_megadrivers.py
-+++ b/bin/install_megadrivers.py
-@@ -56,7 +56,7 @@ def main():
-         if os.path.lexists(abs_driver):
-             os.unlink(abs_driver)
-         print('installing {} to {}'.format(args.megadriver, abs_driver))
--        os.link(master, abs_driver)
-+        os.symlink(os.path.basename(master), abs_driver)
- 
-         try:
-             ret = os.getcwd()
-@@ -71,8 +71,7 @@ def main():
-         finally:
-             os.chdir(ret)
- 
--    # Remove meson-created master .so and symlinks
--    os.unlink(master)
-+    # Remove meson-created symlinks
-     name, ext = os.path.splitext(master)
-     while ext != '.so':
-         if os.path.lexists(name):
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index c90500de7416..60d7c6d8c080 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.3.7
+version=22.0.4
 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=c7971f58fa826e474617cda53250c6600fce60994b9fac5b641522e21f471ed4
 
 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"

  parent reply	other threads:[~2022-05-21 14:42 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-02 19:37 [PR PATCH] [WIP] mesa: update to 22.0.2 zlice
2022-05-02 21:03 ` [PR PATCH] [Updated] " zlice
2022-05-02 21:09 ` zlice
2022-05-02 21:22 ` zlice
2022-05-02 21:46 ` zlice
2022-05-06  0:33 ` tsndqst
2022-05-06 21:23 ` [PR REVIEW] " tsndqst
2022-05-06 21:25 ` [PR PATCH] [Updated] " zlice
2022-05-07  6:09 ` wundrweapon
2022-05-07 11:56 ` zlice
2022-05-07 19:56 ` wundrweapon
2022-05-07 20:53 ` wundrweapon
2022-05-09  2:42 ` HadetTheUndying
2022-05-14 20:59 ` [PR PATCH] [Updated] " zlice
2022-05-14 21:20 ` [PR REVIEW] " tsndqst
2022-05-14 23:10 ` [PR PATCH] [Updated] " zlice
2022-05-15 12:32 ` mesa: update to 22.0.3 zlice
2022-05-21 12:02 ` HadetTheUndying
2022-05-21 14:42 ` zlice [this message]
2022-05-23 15:20 ` mesa: update to 22.0.4 zlice
2022-05-26  3:35 ` RicArch97
2022-06-01 17:25 ` sug0
2022-06-01 17:27 ` zlice
2022-06-02 12:32 ` [PR REVIEW] " ericonr
2022-06-02 12:32 ` ericonr
2022-06-02 12:35 ` zlice
2022-06-02 12:41 ` zlice
2022-06-02 12:47 ` sug0
2022-06-02 12:59 ` RicArch97
2022-06-02 14:24 ` [PR PATCH] [Updated] " zlice
2022-06-02 14:25 ` [PR REVIEW] " zlice
2022-06-13  3:35 ` [PR PATCH] [Closed]: " abenson
2022-06-13 11:50 ` zlice
2022-06-13 13:17 ` RicArch97

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220521144202.QuHCY1Tgm1PG6otRBhPseTJ0rJUtXOTqwpi9CRT4oKk@z \
    --to=zlice@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).