mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
mesa: update to 22.2.4
This commit is contained in:
parent
363d79c173
commit
c2865060fd
5 changed files with 23 additions and 88 deletions
|
@ -1,39 +0,0 @@
|
||||||
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
|
|
|
@ -1,33 +1,29 @@
|
||||||
Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
|
--- a/meson.build 2022-09-20 17:01:37.000000000 -0400
|
||||||
Status: Not fixed upstream
|
+++ b/meson.build 2022-10-04 16:17:45.905483957 -0400
|
||||||
--- a/meson.build 2022-05-02 16:58:59.796354436 -0400
|
@@ -504,6 +504,11 @@
|
||||||
+++ b/meson.build 2022-05-02 17:07:49.628310289 -0400
|
|
||||||
@@ -490,8 +490,11 @@
|
|
||||||
pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
|
pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
-use_elf_tls = true
|
|
||||||
-pre_args += '-DUSE_ELF_TLS'
|
|
||||||
+#use_elf_tls = true
|
|
||||||
+use_elf_tls = get_option('use-elf-tls')
|
+use_elf_tls = get_option('use-elf-tls')
|
||||||
+if use_elf_tls
|
+if use_elf_tls
|
||||||
+ pre_args += '-DUSE_ELF_TLS'
|
+ pre_args += '-DUSE_ELF_TLS'
|
||||||
+endif
|
+endif
|
||||||
|
+
|
||||||
if with_platform_android and get_option('platform-sdk-version') >= 29
|
if with_platform_android and get_option('platform-sdk-version') >= 29
|
||||||
# By default the NDK compiler, at least, emits emutls references instead of
|
# By default the NDK compiler, at least, emits emutls references instead of
|
||||||
--- a/meson_options.txt
|
# ELF TLS, even when building targeting newer API levels. Make it actually do
|
||||||
+++ b/meson_options.txt
|
--- a/meson_options.txt 2022-09-20 17:01:37.000000000 -0400
|
||||||
@@ -446,6 +446,12 @@ option(
|
+++ b/meson_options.txt 2022-10-04 16:21:30.469304615 -0400
|
||||||
value : 25,
|
@@ -472,6 +472,12 @@
|
||||||
description : 'Android Platform SDK version. Default: Nougat version.'
|
description : 'Android Platform SDK version. Default: Nougat version.'
|
||||||
)
|
)
|
||||||
+option(
|
option(
|
||||||
+ 'use-elf-tls',
|
+ 'use-elf-tls',
|
||||||
+ type : 'boolean',
|
+ type : 'boolean',
|
||||||
+ value : true,
|
+ value : true,
|
||||||
+ description : 'Build support for initial-exec TLS model'
|
+ description : 'Build support for initial-exec TLS model'
|
||||||
+)
|
+)
|
||||||
option(
|
+option(
|
||||||
'zstd',
|
'zstd',
|
||||||
type : 'combo',
|
type : 'combo',
|
||||||
|
choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
|
|
@ -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):
|
|
|
@ -1,8 +1,6 @@
|
||||||
diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
|
--- a/src/c11/impl/threads_posix.c 2022-10-04 16:30:04.564345425 -0400
|
||||||
index 45cb6075e6..1a2ea1a450 100644
|
+++ b/src/c11/impl/threads_posix.c 2022-10-04 16:43:51.794135619 -0400
|
||||||
--- a/include/c11/threads_posix.h
|
@@ -255,18 +255,33 @@
|
||||||
+++ b/include/c11/threads_posix.h
|
|
||||||
@@ -281,15 +281,29 @@ static inline int
|
|
||||||
thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
|
thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
|
||||||
{
|
{
|
||||||
struct impl_thrd_param *pack;
|
struct impl_thrd_param *pack;
|
||||||
|
@ -33,3 +31,7 @@ index 45cb6075e6..1a2ea1a450 100644
|
||||||
return thrd_success;
|
return thrd_success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
+
|
||||||
|
// 7.25.5.2
|
||||||
|
thrd_t
|
||||||
|
thrd_current(void)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'mesa'
|
# Template file for 'mesa'
|
||||||
pkgname=mesa
|
pkgname=mesa
|
||||||
version=22.1.7
|
version=22.2.4
|
||||||
revision=1
|
revision=1
|
||||||
build_style=meson
|
build_style=meson
|
||||||
configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
|
configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
|
||||||
|
@ -20,9 +20,9 @@ short_desc="Graphics library similar to SGI's OpenGL"
|
||||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="MIT, LGPL-2.1-or-later"
|
license="MIT, LGPL-2.1-or-later"
|
||||||
homepage="https://www.mesa3d.org/"
|
homepage="https://www.mesa3d.org/"
|
||||||
changelog="https://docs.mesa3d.org/relnotes/${version}.html"
|
changelog="https://docs.mesa3d.org/relnotes.html"
|
||||||
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
|
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
|
||||||
checksum=da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89
|
checksum=65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab
|
||||||
|
|
||||||
build_options="wayland"
|
build_options="wayland"
|
||||||
build_options_default="wayland"
|
build_options_default="wayland"
|
||||||
|
@ -89,6 +89,7 @@ if [ "$_have_amd" ]; then
|
||||||
subpackages+=" mesa-vulkan-radeon"
|
subpackages+=" mesa-vulkan-radeon"
|
||||||
# transitional dummy packages
|
# transitional dummy packages
|
||||||
subpackages+=" mesa-ati-dri"
|
subpackages+=" mesa-ati-dri"
|
||||||
|
configure_args+=" -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$_have_intel" ]; then
|
if [ "$_have_intel" ]; then
|
||||||
|
|
Loading…
Add table
Reference in a new issue