* update mesa to 1:23.2.1-2
This commit is contained in:
parent
08e560ad4f
commit
ae58374586
@ -0,0 +1,72 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: WinLinux1028 <reimu@hakurei.win>
|
||||
Date: Tue, 11 Jul 2023 18:16:01 +0900
|
||||
Subject: [PATCH] radeonsi: prefix function with si_ to prevent name collision
|
||||
|
||||
Fixed a build error caused by multiple gfx11_init_query symbols when building with iris and radeonsi specified in gallium-drivers.
|
||||
|
||||
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9238
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24045>
|
||||
---
|
||||
src/gallium/drivers/radeonsi/gfx11_query.c | 4 ++--
|
||||
src/gallium/drivers/radeonsi/si_pipe.c | 4 ++--
|
||||
src/gallium/drivers/radeonsi/si_pipe.h | 4 ++--
|
||||
3 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/gallium/drivers/radeonsi/gfx11_query.c b/src/gallium/drivers/radeonsi/gfx11_query.c
|
||||
index bfcd8e251105..2a331cc3bda2 100644
|
||||
--- a/src/gallium/drivers/radeonsi/gfx11_query.c
|
||||
+++ b/src/gallium/drivers/radeonsi/gfx11_query.c
|
||||
@@ -422,13 +422,13 @@ struct pipe_query *gfx11_sh_query_create(struct si_screen *screen, enum pipe_que
|
||||
return (struct pipe_query *)query;
|
||||
}
|
||||
|
||||
-void gfx11_init_query(struct si_context *sctx)
|
||||
+void si_gfx11_init_query(struct si_context *sctx)
|
||||
{
|
||||
list_inithead(&sctx->shader_query_buffers);
|
||||
sctx->atoms.s.shader_query.emit = emit_shader_query;
|
||||
}
|
||||
|
||||
-void gfx11_destroy_query(struct si_context *sctx)
|
||||
+void si_gfx11_destroy_query(struct si_context *sctx)
|
||||
{
|
||||
if (!sctx->shader_query_buffers.next)
|
||||
return;
|
||||
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
|
||||
index 91da22b5746c..f11cd2256b95 100644
|
||||
--- a/src/gallium/drivers/radeonsi/si_pipe.c
|
||||
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
|
||||
@@ -192,7 +192,7 @@ static void si_destroy_context(struct pipe_context *context)
|
||||
si_release_all_descriptors(sctx);
|
||||
|
||||
if (sctx->gfx_level >= GFX10 && sctx->has_graphics)
|
||||
- gfx11_destroy_query(sctx);
|
||||
+ si_gfx11_destroy_query(sctx);
|
||||
|
||||
if (sctx->sqtt) {
|
||||
struct si_screen *sscreen = sctx->screen;
|
||||
@@ -637,7 +637,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign
|
||||
/* Initialize graphics-only context functions. */
|
||||
if (sctx->has_graphics) {
|
||||
if (sctx->gfx_level >= GFX10)
|
||||
- gfx11_init_query(sctx);
|
||||
+ si_gfx11_init_query(sctx);
|
||||
si_init_msaa_functions(sctx);
|
||||
si_init_shader_functions(sctx);
|
||||
si_init_state_functions(sctx);
|
||||
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
|
||||
index 55f1d1788f1a..389716854f9a 100644
|
||||
--- a/src/gallium/drivers/radeonsi/si_pipe.h
|
||||
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
|
||||
@@ -1616,8 +1616,8 @@ void *si_create_query_result_cs(struct si_context *sctx);
|
||||
void *gfx11_create_sh_query_result_cs(struct si_context *sctx);
|
||||
|
||||
/* gfx11_query.c */
|
||||
-void gfx11_init_query(struct si_context *sctx);
|
||||
-void gfx11_destroy_query(struct si_context *sctx);
|
||||
+void si_gfx11_init_query(struct si_context *sctx);
|
||||
+void si_gfx11_destroy_query(struct si_context *sctx);
|
||||
|
||||
/* si_test_image_copy_region.c */
|
||||
void si_test_image_copy_region(struct si_screen *sscreen);
|
||||
@ -19,8 +19,8 @@ pkgname=(
|
||||
case "${CARCH}" in
|
||||
x86_64) pkgname+=('vulkan-intel') ;;
|
||||
esac
|
||||
pkgver=23.1.7
|
||||
pkgrel=1
|
||||
pkgver=23.2.1
|
||||
pkgrel=2
|
||||
epoch=1
|
||||
pkgdesc="An open-source implementation of the OpenGL specification"
|
||||
url="https://www.mesa3d.org/"
|
||||
@ -49,6 +49,7 @@ makedepends=(
|
||||
'systemd'
|
||||
'vulkan-icd-loader'
|
||||
'wayland'
|
||||
'xcb-util-keysyms'
|
||||
'zstd'
|
||||
|
||||
# shared between mesa and lib32-mesa
|
||||
@ -76,15 +77,18 @@ makedepends=(
|
||||
source=(
|
||||
https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
|
||||
LICENSE
|
||||
0001-big-endian-flipping.patch
|
||||
0001-radeonsi-prefix-function-with-si_-to-prevent-name-co.patch
|
||||
0002-big-endian-flipping.patch
|
||||
)
|
||||
sha256sums=('409641eadf0ed1c7794797a6f5a0b0195b5580b282166e5ec5629c6bcda6acd3'
|
||||
sha256sums=('64de0616fc2d801f929ab1ac2a4f16b3e2783c4309a724c8a259b20df8bbc1cc'
|
||||
'SKIP'
|
||||
'7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537'
|
||||
'fcd21477e5c6122dc74f72457364448b171f7843b7a671e1f9df9c61bd888898'
|
||||
'0a8f2792dfd0469bc41540884fe2a1dbf4f0fd92f53bad5b9db831ac1e59dd11')
|
||||
b2sums=('ec688b2a5db396423e53b8798dfbff0c2034e6f0f80e3b73a27b92b0441cfa8578bb633577b5199f1a4a107bdf80af23bc4663b424324f2f71b0abcaa6c4b103'
|
||||
b2sums=('51e44c2e9b7dfe17cf4cb7252e169109d03a006caa8ec34036fb594c0c44e9278d0088170894c1a9debdea911f746470e1d256576e0635cae5c3e670ab49161b'
|
||||
'SKIP'
|
||||
'1ecf007b82260710a7bf5048f47dd5d600c168824c02c595af654632326536a6527fbe0738670ee7b921dd85a70425108e0f471ba85a8e1ca47d294ad74b4adb'
|
||||
'b5f2ee167103d53bc0d5ada123d9c3a1e394b5c0b992401da2d4cf69da30710f7d5b6b9264634e02a1e9856798780c1dc3faed01058274599290cb82c15dd193'
|
||||
'c28718783873be25fa2d6c0f43fae900f93e2f20df1c11a40ec86622112b7be7e7f50c3b77e52849fec9288fb8da3744d8bc2027df941ffd0b8c558fe3a927ba')
|
||||
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov@gmail.com>
|
||||
'946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty@igalia.com>
|
||||
@ -95,7 +99,17 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l
|
||||
|
||||
prepare() {
|
||||
cd mesa-$pkgver
|
||||
patch -Np1 -i ${srcdir}/0001-big-endian-flipping.patch
|
||||
# https://bugs.archlinux.org/task/79831
|
||||
# https://gitlab.freedesktop.org/mesa/mesa/-/issues/9889#note_2113953
|
||||
patch -Np1 -i ../0001-radeonsi-prefix-function-with-si_-to-prevent-name-co.patch
|
||||
|
||||
# Big endian specific
|
||||
patch -Np1 -i ../0002-big-endian-flipping.patch
|
||||
|
||||
# Include package release in version string so Chromium invalidates
|
||||
# its GPU cache; otherwise it can cause pages to render incorrectly.
|
||||
# https://bugs.launchpad.net/ubuntu/+source/chromium-browser/+bug/2020604
|
||||
echo "$pkgver-arch$epoch.$pkgrel" >VERSION
|
||||
}
|
||||
|
||||
build() {
|
||||
@ -140,7 +154,7 @@ build() {
|
||||
-D shared-glapi=enabled
|
||||
-D valgrind=enabled
|
||||
-D video-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc
|
||||
-D vulkan-drivers=amd,swrast,virtio-experimental${_platform_vulkan_drivers}
|
||||
-D vulkan-drivers=amd,swrast,virtio${_platform_vulkan_drivers}
|
||||
-D vulkan-layers=device-select,intel-nullhw,overlay
|
||||
)
|
||||
|
||||
@ -245,6 +259,7 @@ package_vulkan-intel() {
|
||||
'libxshmfence'
|
||||
'systemd'
|
||||
'wayland'
|
||||
'xcb-util-keysyms'
|
||||
'zstd'
|
||||
)
|
||||
optdepends=('vulkan-mesa-layers: additional vulkan layers')
|
||||
@ -266,6 +281,7 @@ package_vulkan-radeon() {
|
||||
'llvm-libs'
|
||||
'systemd'
|
||||
'wayland'
|
||||
'xcb-util-keysyms'
|
||||
'zstd'
|
||||
)
|
||||
optdepends=('vulkan-mesa-layers: additional vulkan layers')
|
||||
@ -288,6 +304,7 @@ package_vulkan-swrast() {
|
||||
'llvm-libs'
|
||||
'systemd'
|
||||
'wayland'
|
||||
'xcb-util-keysyms'
|
||||
'zstd'
|
||||
)
|
||||
optdepends=('vulkan-mesa-layers: additional vulkan layers')
|
||||
@ -309,6 +326,7 @@ package_vulkan-virtio() {
|
||||
'libxshmfence'
|
||||
'systemd'
|
||||
'wayland'
|
||||
'xcb-util-keysyms'
|
||||
'zstd'
|
||||
)
|
||||
optdepends=('vulkan-mesa-layers: additional vulkan layers')
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user