upg mesa 23.3.2
This commit is contained in:
parent
055804fbb5
commit
891994a259
|
|
@ -0,0 +1,51 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
||||
Date: Mon, 1 Jan 2024 17:19:30 +0100
|
||||
Subject: [PATCH] Revert "d3d12: Only destroy the winsys during screen
|
||||
destruction, not reset"
|
||||
|
||||
This reverts commit 684d11421c30c0f8230ccbcc8dcc94a457eb5f44.
|
||||
|
||||
For: https://gitlab.archlinux.org/archlinux/packaging/packages/mesa/-/issues/5
|
||||
---
|
||||
.pick_status.json | 2 +-
|
||||
src/gallium/drivers/d3d12/d3d12_screen.cpp | 8 ++++----
|
||||
2 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/.pick_status.json b/.pick_status.json
|
||||
index 0c787e915471..f6b0909e7d92 100644
|
||||
--- a/.pick_status.json
|
||||
+++ b/.pick_status.json
|
||||
@@ -2014,7 +2014,7 @@
|
||||
"description": "d3d12: Only destroy the winsys during screen destruction, not reset",
|
||||
"nominated": true,
|
||||
"nomination_type": 1,
|
||||
- "resolution": 1,
|
||||
+ "resolution": 0,
|
||||
"main_sha": null,
|
||||
"because_sha": "81c8e89ff8e846839fffc1d103b2080bef5c1b5c",
|
||||
"notes": null
|
||||
diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp
|
||||
index 9b0233fb9d92..ee74cf2b064f 100644
|
||||
--- a/src/gallium/drivers/d3d12/d3d12_screen.cpp
|
||||
+++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp
|
||||
@@ -735,15 +735,15 @@ d3d12_deinit_screen(struct d3d12_screen *screen)
|
||||
screen->dev->Release();
|
||||
screen->dev = nullptr;
|
||||
}
|
||||
+ if (screen->winsys) {
|
||||
+ screen->winsys->destroy(screen->winsys);
|
||||
+ screen->winsys = nullptr;
|
||||
+ }
|
||||
}
|
||||
|
||||
void
|
||||
d3d12_destroy_screen(struct d3d12_screen *screen)
|
||||
{
|
||||
- if (screen->winsys) {
|
||||
- screen->winsys->destroy(screen->winsys);
|
||||
- screen->winsys = nullptr;
|
||||
- }
|
||||
slab_destroy_parent(&screen->transfer_pool);
|
||||
mtx_destroy(&screen->submit_mutex);
|
||||
mtx_destroy(&screen->descriptor_pool_mutex);
|
||||
|
|
@ -9,7 +9,7 @@ pkgbase=mesa
|
|||
pkgname=('vulkan-mesa-layers' 'opencl-clover-mesa' 'opencl-rusticl-mesa' 'vulkan-intel' 'vulkan-radeon'
|
||||
'vulkan-swrast' 'vulkan-virtio' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
|
||||
pkgver=23.3.2
|
||||
pkgrel=00
|
||||
pkgrel=02
|
||||
epoch=1
|
||||
pkgdesc="An open-source implementation of the OpenGL specification w/o systemd or zstd"
|
||||
url="https://www.mesa3d.org/"
|
||||
|
|
@ -62,10 +62,14 @@ makedepends=(
|
|||
'libomxil-bellagio'
|
||||
)
|
||||
source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
|
||||
LICENSE)
|
||||
0001-Revert-d3d12-Only-destroy-the-winsys-during-screen-d.patch
|
||||
LICENSE)
|
||||
|
||||
prepare() {
|
||||
cd mesa-$pkgver
|
||||
|
||||
# https://gitlab.archlinux.org/archlinux/packaging/packages/mesa/-/issues/5
|
||||
patch -Np1 -i ../0001-Revert-d3d12-Only-destroy-the-winsys-during-screen-d.patch
|
||||
|
||||
# Include package release in version string so Chromium invalidates
|
||||
# its GPU cache; otherwise it can cause pages to render incorrectly.
|
||||
|
|
@ -291,7 +295,6 @@ package_mesa() {
|
|||
|
||||
arch=(x86_64)
|
||||
|
||||
#license=('custom')
|
||||
license=('MIT AND BSD-3-Clause AND SGI-B-2.0')
|
||||
|
||||
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov@gmail.com>
|
||||
|
|
@ -303,16 +306,17 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l
|
|||
|
||||
sha256sums=(3cfcb81fa16f89c56abe3855d2637d396ee4e03849b659000a6b8e5f57e69adc # mesa-23.3.2.tar.xz
|
||||
af032541193cd26c935d3a116429a9bce80705b86b19fca8d7cdb6108cbed5ac # mesa-23.3.2.tar.xz.sig
|
||||
95ac7d00491f84c75af205d26181ae1227faf75c2f767fd6935b8a76d60d4728 # 0001-Revert-d3d12-Only-destroy-the-winsys-during-screen-d.patch
|
||||
7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537) # LICENSE
|
||||
|
||||
## 8a93d865bde76f5640fa7697f12456c68e825c2d1c9a4aa45543c220ed6b5a0b libva-mesa-driver-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
## 97f9a604e6aad4772ac83cb3aa5a69a3a30756d8d1c48d4f07cf2a5e5efd38d2 mesa-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
## ee759c6766f9eea333704bf629f1f526c9989e7dc5d1351b7a0f4ce6b051ac23 mesa-vdpau-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
## 4bb50b47243df4c2f254b2aaf50782290b2ba6307415d2249c7de8f9075ee6ab opencl-clover-mesa-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
## a688b038bfa3f5a65f429d42bb4dc2fcb89a49689bdb9c0c151c85600826eb6d opencl-rusticl-mesa-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
## 6fae02bcc6b46489f68eef24f2381d2ede86b01c41ffd43410bf2657d299adf0 vulkan-intel-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
## 17d43f7c4227d2b78923b96d9dcb7c86d3ec469a107af4e87b65d011826ea106 vulkan-mesa-layers-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
## cc430278e84316eb290ee4b998feab8f43f0b84de5f2bedc3944b592352cf733 vulkan-radeon-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
## c6fd1cb0fdd44dcc705a355d30d20ee7605e5ef38208c71bc49268a1470fabcd vulkan-swrast-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
## 98ea50ccfab16884f392ddeb647dac98c3a0894b67baa0c41d5d7ed429f0457f vulkan-virtio-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
## 14c25f13a455ebc3544c35dca0de505f89a3f3b0a6d8562b1459f96426249eac libva-mesa-driver-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## 1dc5c2c21b41f5d287bdb686d97a8713f36f65e24b7a082ec4942063885173f8 mesa-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## 99de5d3edf6f3651632e5cd6acce4c6d55876449052e7af699393094f4be491e mesa-vdpau-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## a676e66eeb144dde62de38890ac7ead84baf214d008433bfd3e1b7eb10c29cce opencl-clover-mesa-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## e99f602d14d17192ac885251781002ce3e94e7d9f60078e218dd6e416258ebe0 opencl-rusticl-mesa-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## 2ecb6b65b221a8501a8c8236476170e7fa5d7e98af075f77a9baeb1bbb28f814 vulkan-intel-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## d6993965fe7655c1a8a771d8fa8f72c5f38b7c0383042932b18878e918c6caf5 vulkan-mesa-layers-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## 55f296e85e779b438803feba712dd27658c755ec2f51de09cd24a77bf15c3644 vulkan-radeon-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## 8aa834ab698ddfc7f2bea3ded3de2b16fe1957489c0c56c4b41d51c594a46537 vulkan-swrast-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## 3a2d795efcf378d6343833776ff1aca08b5c631f6a30169c77752d2c088b8d01 vulkan-virtio-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ pkgname=(
|
|||
'mesa'
|
||||
)
|
||||
pkgver=23.3.2
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
epoch=1
|
||||
pkgdesc="An open-source implementation of the OpenGL specification"
|
||||
url="https://www.mesa3d.org/"
|
||||
|
|
@ -73,13 +73,16 @@ makedepends=(
|
|||
)
|
||||
source=(
|
||||
https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
|
||||
0001-Revert-d3d12-Only-destroy-the-winsys-during-screen-d.patch
|
||||
LICENSE
|
||||
)
|
||||
sha256sums=('3cfcb81fa16f89c56abe3855d2637d396ee4e03849b659000a6b8e5f57e69adc'
|
||||
'SKIP'
|
||||
'95ac7d00491f84c75af205d26181ae1227faf75c2f767fd6935b8a76d60d4728'
|
||||
'7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537')
|
||||
b2sums=('fc97e17dd7a139056190010325f1d57978ef8618ae87731f459daedc303223f3fbce660c2361dcd518d35c709357435366c75ebfd6366daa9f0dec99b534604f'
|
||||
'SKIP'
|
||||
'4ee0dde6be8134e71a7d0034e8aff58f1479c9787400ca404bbfccfb1b1a2ce12e84616341c6856b043d3cd2be1af82717e85e1d0f67eac1afc386ceb610a272'
|
||||
'1ecf007b82260710a7bf5048f47dd5d600c168824c02c595af654632326536a6527fbe0738670ee7b921dd85a70425108e0f471ba85a8e1ca47d294ad74b4adb')
|
||||
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov@gmail.com>
|
||||
'946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty@igalia.com>
|
||||
|
|
@ -91,6 +94,9 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l
|
|||
prepare() {
|
||||
cd mesa-$pkgver
|
||||
|
||||
# https://gitlab.archlinux.org/archlinux/packaging/packages/mesa/-/issues/5
|
||||
patch -Np1 -i ../0001-Revert-d3d12-Only-destroy-the-winsys-during-screen-d.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
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
mv vulkan-mesa-layers-1:23.3.2-00-x86_64.pkg.tar.lz vulkan-mesa-layers-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
mv opencl-clover-mesa-1:23.3.2-00-x86_64.pkg.tar.lz opencl-clover-mesa-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
mv opencl-rusticl-mesa-1:23.3.2-00-x86_64.pkg.tar.lz opencl-rusticl-mesa-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
mv vulkan-intel-1:23.3.2-00-x86_64.pkg.tar.lz vulkan-intel-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
mv vulkan-radeon-1:23.3.2-00-x86_64.pkg.tar.lz vulkan-radeon-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
mv vulkan-swrast-1:23.3.2-00-x86_64.pkg.tar.lz vulkan-swrast-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
mv vulkan-virtio-1:23.3.2-00-x86_64.pkg.tar.lz vulkan-virtio-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
mv libva-mesa-driver-1:23.3.2-00-x86_64.pkg.tar.lz libva-mesa-driver-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
mv mesa-vdpau-1:23.3.2-00-x86_64.pkg.tar.lz mesa-vdpau-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
mv mesa-1:23.3.2-00-x86_64.pkg.tar.lz mesa-1_23.3.2-00-x86_64.pkg.tar.lz
|
||||
mv vulkan-mesa-layers-1:23.3.2-02-x86_64.pkg.tar.lz vulkan-mesa-layers-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv opencl-clover-mesa-1:23.3.2-02-x86_64.pkg.tar.lz opencl-clover-mesa-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv opencl-rusticl-mesa-1:23.3.2-02-x86_64.pkg.tar.lz opencl-rusticl-mesa-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv vulkan-intel-1:23.3.2-02-x86_64.pkg.tar.lz vulkan-intel-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv vulkan-radeon-1:23.3.2-02-x86_64.pkg.tar.lz vulkan-radeon-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv vulkan-swrast-1:23.3.2-02-x86_64.pkg.tar.lz vulkan-swrast-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv vulkan-virtio-1:23.3.2-02-x86_64.pkg.tar.lz vulkan-virtio-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv libva-mesa-driver-1:23.3.2-02-x86_64.pkg.tar.lz libva-mesa-driver-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv mesa-vdpau-1:23.3.2-02-x86_64.pkg.tar.lz mesa-vdpau-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv mesa-1:23.3.2-02-x86_64.pkg.tar.lz mesa-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
Loading…
Reference in New Issue