Date: Thursday, December 15, 2022 @ 05:15:48
Author: heftig
Revision: 464347
archrelease: copy trunk to staging-x86_64
Added:
mesa/repos/staging-x86_64/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
(from rev 464346,
mesa/trunk/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch)
mesa/repos/staging-x86_64/LICENSE
(from rev 464346, mesa/trunk/LICENSE)
mesa/repos/staging-x86_64/PKGBUILD
(from rev 464346, mesa/trunk/PKGBUILD)
mesa/repos/staging-x86_64/keys/
Deleted:
mesa/repos/staging-x86_64/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
mesa/repos/staging-x86_64/0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
mesa/repos/staging-x86_64/0003-d3d12-Don-t-crash-when-libd3d12.so-can-t-be-found.patch
mesa/repos/staging-x86_64/LICENSE
mesa/repos/staging-x86_64/PKGBUILD
mesa/repos/staging-x86_64/keys/
-----------------------------------------------------------------+
0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch | 92 +-
0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch | 83 -
0003-d3d12-Don-t-crash-when-libd3d12.so-can-t-be-found.patch | 28
LICENSE | 166 +--
PKGBUILD | 459
++++------
5 files changed, 360 insertions(+), 468 deletions(-)
Deleted: 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
===================================================================
--- 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
2022-12-15 05:15:20 UTC (rev 464346)
+++ 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
2022-12-15 05:15:48 UTC (rev 464347)
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lionel Landwerlin <lionel.g.landwer...@intel.com>
-Date: Sun, 12 Jun 2022 23:59:05 +0300
-Subject: [PATCH] anv: force MEDIA_INTERFACE_DESCRIPTOR_LOAD reemit after
- 3D->GPGPU switch
-
-Seems to fix a hang in Age of Empire 4 where the HW is hung on a
-PIPE_CONTROL after a GPGPU_WALKER but no
-MEDIA_INTERFACE_DESCRIPTOR_LOAD was emitted since the switch from 3D
-to GPGPU.
-
-This would happen in the following case :
-
- vkCmdBindPipeline(COMPUTE, cs_pipeline);
- vkCmdDispatch(...);
- vkCmdBindPipeline(GRAPHICS, gfx_pipeline);
- vkCmdDraw(...);
- vkCmdDispatch(...);
-
-Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
----
- src/intel/vulkan/genX_cmd_buffer.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/intel/vulkan/genX_cmd_buffer.c
b/src/intel/vulkan/genX_cmd_buffer.c
-index 1aa997f2ade2..2e9979c8f63e 100644
---- a/src/intel/vulkan/genX_cmd_buffer.c
-+++ b/src/intel/vulkan/genX_cmd_buffer.c
-@@ -5955,6 +5955,11 @@ genX(flush_pipeline_select)(struct anv_cmd_buffer
*cmd_buffer,
- }
- #endif
-
-+#if GFX_VERx10 == 120
-+ if (pipeline == _3D)
-+ cmd_buffer->state.compute.pipeline_dirty = true;
-+#endif
-+
- /* From "BXML » GT » MI » vol1a GPU Overview » [Instruction]
- * PIPELINE_SELECT [DevBWR+]":
- *
Copied:
mesa/repos/staging-x86_64/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
(from rev 464346,
mesa/trunk/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch)
===================================================================
--- 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
(rev 0)
+++ 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
2022-12-15 05:15:48 UTC (rev 464347)
@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <lionel.g.landwer...@intel.com>
+Date: Sun, 12 Jun 2022 23:59:05 +0300
+Subject: [PATCH] anv: force MEDIA_INTERFACE_DESCRIPTOR_LOAD reemit after
+ 3D->GPGPU switch
+
+Seems to fix a hang in the following titles :
+ - Age of Empire 4
+ - Monster Hunter Rise
+
+where the HW is hung on a PIPE_CONTROL after a GPGPU_WALKER but no
+MEDIA_INTERFACE_DESCRIPTOR_LOAD was emitted since the switch from 3D
+to GPGPU.
+
+This would happen in the following case :
+
+ vkCmdBindPipeline(COMPUTE, cs_pipeline);
+ vkCmdDispatch(...);
+ vkCmdBindPipeline(GRAPHICS, gfx_pipeline);
+ vkCmdDraw(...);
+ vkCmdDispatch(...);
+
+Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
+---
+ src/intel/vulkan/genX_cmd_buffer.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/src/intel/vulkan/genX_cmd_buffer.c
b/src/intel/vulkan/genX_cmd_buffer.c
+index d56f9037fde1..e03dc16c1fc5 100644
+--- a/src/intel/vulkan/genX_cmd_buffer.c
++++ b/src/intel/vulkan/genX_cmd_buffer.c
+@@ -6001,6 +6001,20 @@ genX(flush_pipeline_select)(struct anv_cmd_buffer
*cmd_buffer,
+ }
+ #endif
+
++#if GFX_VERx10 == 120
++ /* Undocumented workaround to force the re-emission of
++ * MEDIA_INTERFACE_DESCRIPTOR_LOAD when switching from 3D to Compute
++ * pipeline without rebinding a pipeline :
++ * vkCmdBindPipeline(COMPUTE, cs_pipeline);
++ * vkCmdDispatch(...);
++ * vkCmdBindPipeline(GRAPHICS, gfx_pipeline);
++ * vkCmdDraw(...);
++ * vkCmdDispatch(...);
++ */
++ if (pipeline == _3D)
++ cmd_buffer->state.compute.pipeline_dirty = true;
++#endif
++
+ /* From "BXML » GT » MI » vol1a GPU Overview » [Instruction]
+ * PIPELINE_SELECT [DevBWR+]":
+ *
Deleted: 0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
===================================================================
--- 0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
2022-12-15 05:15:20 UTC (rev 464346)
+++ 0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
2022-12-15 05:15:48 UTC (rev 464347)
@@ -1,83 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lionel Landwerlin <lionel.g.landwer...@intel.com>
-Date: Sat, 25 Jun 2022 23:38:45 +0300
-Subject: [PATCH] intel/fs: always mask the bottom bits of the sampler extended
- descriptor
-
-Fixes a hang in Age Of Empire 4. The HW is hang with the sampler input
-unit busy. Replaying on simulation showed the extended message length
-in the extended descriptor is invalid. Since the Anv ensures the input
-is correct in anv_surface_state_to_handle(), the likely reason for
-this issue is the use of VK_VALVE_mutable_descriptor_type and the
-application leaving a previous value for a different descriptor type.
-
-Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
----
- src/intel/compiler/brw_fs.cpp | 2 +-
- .../compiler/brw_lower_logical_sends.cpp | 20 +++++++++++++++----
- 2 files changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
-index 624454676031..061eb7d603bb 100644
---- a/src/intel/compiler/brw_fs.cpp
-+++ b/src/intel/compiler/brw_fs.cpp
-@@ -4439,7 +4439,7 @@ brw_fb_write_msg_control(const fs_inst *inst,
- return mctl;
- }
-
-- /**
-+/**
- * Predicate the specified instruction on the sample mask.
- */
- void
-diff --git a/src/intel/compiler/brw_lower_logical_sends.cpp
b/src/intel/compiler/brw_lower_logical_sends.cpp
-index 1ff064d342ae..90cb00daeb9b 100644
---- a/src/intel/compiler/brw_lower_logical_sends.cpp
-+++ b/src/intel/compiler/brw_lower_logical_sends.cpp
-@@ -1117,30 +1117,42 @@ lower_sampler_logical_send_gfx7(const fs_builder &bld,
fs_inst *inst, opcode op,
- inst->src[1] = brw_imm_ud(0);
- } else if (surface_handle.file != BAD_FILE) {
- /* Bindless surface */
-+ const fs_builder ubld = bld.group(1, 0).exec_all();
- assert(devinfo->ver >= 9);
- inst->desc = brw_sampler_desc(devinfo,
- GFX9_BTI_BINDLESS,
- sampler.file == IMM ? sampler.ud % 16 : 0,
- msg_type,
- simd_mode,
- 0 /* return_format unused on gfx7+ */);
-
- /* For bindless samplers, the entire address is included in the message
- * header so we can leave the portion in the message descriptor 0.
- */
- if (sampler_handle.file != BAD_FILE || sampler.file == IMM) {
- inst->src[0] = brw_imm_ud(0);
- } else {
-- const fs_builder ubld = bld.group(1, 0).exec_all();
- fs_reg desc = ubld.vgrf(BRW_REGISTER_TYPE_UD);
- ubld.SHL(desc, sampler, brw_imm_ud(8));
- inst->src[0] = desc;
- }
-
-- /* We assume that the driver provided the handle in the top 20 bits so
-- * we can use the surface handle directly as the extended descriptor.
-+ /* We previously assumed that the driver provided the handle in the top
-+ * 20 bits (leaving the bottom 12 bits at 0). But with extensions like
-+ * VK_VALVE_mutable_descriptor_type, the application is more in control
-+ * of the content of VkDescriptors which is where we store
-+ * surface/sampler offsets. We experience GPU hangs because the
-+ * application left an invalid value in the descriptor (probably used
-+ * for another descriptor type than sampler) and the lower 12bits of the
-+ * surface handle overlapping with the extended descriptor length make
-+ * the HW hang. The following AND() clears those bits and fixes a hang
-+ * in Age Of Empire 4.
- */
-- inst->src[1] = retype(surface_handle, BRW_REGISTER_TYPE_UD);
-+ fs_reg ex_desc = ubld.vgrf(BRW_REGISTER_TYPE_UD);
-+ ubld.AND(ex_desc,
-+ retype(surface_handle, BRW_REGISTER_TYPE_UD),
-+ brw_imm_ud(INTEL_MASK(31, 12)));
-+ inst->src[1] = component(ex_desc, 0);
- } else {
- /* Immediate portion of the descriptor */
- inst->desc = brw_sampler_desc(devinfo,
Deleted: 0003-d3d12-Don-t-crash-when-libd3d12.so-can-t-be-found.patch
===================================================================
--- 0003-d3d12-Don-t-crash-when-libd3d12.so-can-t-be-found.patch
2022-12-15 05:15:20 UTC (rev 464346)
+++ 0003-d3d12-Don-t-crash-when-libd3d12.so-can-t-be-found.patch
2022-12-15 05:15:48 UTC (rev 464347)
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <hef...@archlinux.org>
-Date: Sun, 4 Dec 2022 00:17:57 +0000
-Subject: [PATCH] d3d12: Don't crash when libd3d12.so can't be found
-
-`d3d12_destroy_screen` is called by `d3d12_create_dxcore_screen` after
-`d3d12_init_screen_base` fails and attempts to call `util_dl_close` on
-a NULL pointer, leading to an abort.
-
-To fix this, only close the library after if it was actually opened.
----
- src/gallium/drivers/d3d12/d3d12_screen.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp
b/src/gallium/drivers/d3d12/d3d12_screen.cpp
-index 1cbe1fbdd5ec..c21c60e4a29c 100644
---- a/src/gallium/drivers/d3d12/d3d12_screen.cpp
-+++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp
-@@ -741,7 +741,8 @@ d3d12_destroy_screen(struct d3d12_screen *screen)
- slab_destroy_parent(&screen->transfer_pool);
- mtx_destroy(&screen->submit_mutex);
- mtx_destroy(&screen->descriptor_pool_mutex);
-- util_dl_close(screen->d3d12_mod);
-+ if (screen->d3d12_mod)
-+ util_dl_close(screen->d3d12_mod);
- glsl_type_singleton_decref();
- FREE(screen);
- }
Deleted: LICENSE
===================================================================
--- LICENSE 2022-12-15 05:15:20 UTC (rev 464346)
+++ LICENSE 2022-12-15 05:15:48 UTC (rev 464347)
@@ -1,83 +0,0 @@
-The Mesa 3D Graphics Library
-
-Disclaimer
-
- Mesa is a 3-D graphics library with an API which is very similar to
- that of [1]OpenGL.* To the extent that Mesa utilizes the OpenGL command
- syntax or state machine, it is being used with authorization from
- [2]Silicon Graphics, Inc.(SGI). However, the author does not possess an
- OpenGL license from SGI, and makes no claim that Mesa is in any way a
- compatible replacement for OpenGL or associated with SGI. Those who
- want a licensed implementation of OpenGL should contact a licensed
- vendor.
-
- Please do not refer to the library as MesaGL (for legal reasons). It's
- just Mesa or The Mesa 3-D graphics library.
-
- * OpenGL is a trademark of [3]Silicon Graphics Incorporated.
-
-License / Copyright Information
-
- The Mesa distribution consists of several components. Different
- copyrights and licenses apply to different components. For example, the
- GLX client code uses the SGI Free Software License B, and some of the
- Mesa device drivers are copyrighted by their authors. See below for a
- list of Mesa's main components and the license for each.
-
- The core Mesa library is licensed according to the terms of the MIT
- license. This allows integration with the XFree86, Xorg and DRI
- projects.
-
- The default Mesa license is as follows:
-
-Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Attention, Contributors
-
- When contributing to the Mesa project you must agree to the licensing
- terms of the component to which you're contributing. The following
- section lists the primary components of the Mesa distribution and their
- respective licenses.
-
-Mesa Component Licenses
-
-Component Location License
-------------------------------------------------------------------
-Main Mesa code src/mesa/ MIT
-
-Device drivers src/mesa/drivers/* MIT, generally
-
-Gallium code src/gallium/ MIT
-
-Ext headers include/GL/glext.h Khronos
- include/GL/glxext.h
-
-GLX client code src/glx/ SGI Free Software License B
-
-C11 thread include/c11/threads*.h Boost (permissive) emulation
-
- In general, consult the source files for license terms.
-
-References
-
- 1. https://www.opengl.org/
- 2. https://www.sgi.com/
- 3. https://www.sgi.com/
Copied: mesa/repos/staging-x86_64/LICENSE (from rev 464346, mesa/trunk/LICENSE)
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2022-12-15 05:15:48 UTC (rev 464347)
@@ -0,0 +1,83 @@
+The Mesa 3D Graphics Library
+
+Disclaimer
+
+ Mesa is a 3-D graphics library with an API which is very similar to
+ that of [1]OpenGL.* To the extent that Mesa utilizes the OpenGL command
+ syntax or state machine, it is being used with authorization from
+ [2]Silicon Graphics, Inc.(SGI). However, the author does not possess an
+ OpenGL license from SGI, and makes no claim that Mesa is in any way a
+ compatible replacement for OpenGL or associated with SGI. Those who
+ want a licensed implementation of OpenGL should contact a licensed
+ vendor.
+
+ Please do not refer to the library as MesaGL (for legal reasons). It's
+ just Mesa or The Mesa 3-D graphics library.
+
+ * OpenGL is a trademark of [3]Silicon Graphics Incorporated.
+
+License / Copyright Information
+
+ The Mesa distribution consists of several components. Different
+ copyrights and licenses apply to different components. For example, the
+ GLX client code uses the SGI Free Software License B, and some of the
+ Mesa device drivers are copyrighted by their authors. See below for a
+ list of Mesa's main components and the license for each.
+
+ The core Mesa library is licensed according to the terms of the MIT
+ license. This allows integration with the XFree86, Xorg and DRI
+ projects.
+
+ The default Mesa license is as follows:
+
+Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Attention, Contributors
+
+ When contributing to the Mesa project you must agree to the licensing
+ terms of the component to which you're contributing. The following
+ section lists the primary components of the Mesa distribution and their
+ respective licenses.
+
+Mesa Component Licenses
+
+Component Location License
+------------------------------------------------------------------
+Main Mesa code src/mesa/ MIT
+
+Device drivers src/mesa/drivers/* MIT, generally
+
+Gallium code src/gallium/ MIT
+
+Ext headers include/GL/glext.h Khronos
+ include/GL/glxext.h
+
+GLX client code src/glx/ SGI Free Software License B
+
+C11 thread include/c11/threads*.h Boost (permissive) emulation
+
+ In general, consult the source files for license terms.
+
+References
+
+ 1. https://www.opengl.org/
+ 2. https://www.sgi.com/
+ 3. https://www.sgi.com/
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-15 05:15:20 UTC (rev 464346)
+++ PKGBUILD 2022-12-15 05:15:48 UTC (rev 464347)
@@ -1,234 +0,0 @@
-# Maintainer: Laurent Carlier <lordhea...@gmail.com>
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Jan de Groot <j...@archlinux.org>
-# Contributor: Andreas Radke <andy...@archlinux.org>
-
-pkgbase=mesa
-pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon'
'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
-pkgdesc="An open-source implementation of the OpenGL specification"
-pkgver=22.3.0
-pkgrel=6
-arch=('x86_64')
-makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm'
'libxshmfence' 'libxxf86vm'
- 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
'zstd' 'elfutils' 'llvm'
- 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind'
'lm_sensors' 'libxrandr'
- 'systemd' 'valgrind' 'glslang' 'vulkan-icd-loader'
'directx-headers' 'cmake' 'meson')
-makedepends+=('rust' 'rust-bindgen' 'spirv-tools' 'spirv-llvm-translator') #
rusticl dependencies
-url="https://www.mesa3d.org/";
-license=('custom')
-options=('debug' '!lto')
-source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
- 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
- 0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
- 0003-d3d12-Don-t-crash-when-libd3d12.so-can-t-be-found.patch
- LICENSE)
-sha512sums=('bf4d344459f97d266a5943b33aecf062b0825e13c1617afdab71c4ba6a87a201440761c9a32a6e0060910a0917122e3f4d29f666d6b94a38a71c94b9ff3ab9da'
- 'SKIP'
-
'4ff7c359f08aedb1fb6eb2c6bb34bafa399edfa7916cd6cce7844bb38795e84c0265324e3fc7d37237d4824f029cb04da176bcf476785fd2e35a8b0ce4f8a394'
-
'5dd0cb8affa9cfe6e7d94f59b8e23727036fd8ab76938321f8d266315f30611584da6f6277fe2aa920130483302adab5e57e2bc08f1bd3c62ea57b3e4b007305'
-
'8747e6ded9e73b9f6eed72d922b21ca2a67f028eef05ce3bf237f248d3b765bb3db52e2f25a51c2add7fc82ef23aeb70afb5aefe88bdbe2d9fe4b7008007c397'
-
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
-validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov
<emil.l.veli...@gmail.com>
- '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez
<ta...@igalia.com>
- 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895' # Juan Antonio
Suárez Romero (Igalia, S.L.) <jasua...@igalia.com>
- 'A5CC9FEC93F2F837CB044912336909B6B25FADFA' # Juan A. Suarez
Romero <jasua...@igalia.com>
- '71C4B75620BC75708B4BDB254C95FAAB3EB073EC' # Dylan Baker
<dy...@pnwbakers.com>
- '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom
<e...@engestrom.ch>
-
-prepare() {
- cd mesa-$pkgver
-
- # https://gitlab.freedesktop.org/mesa/mesa/-/issues/7111
- # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17247
- # https://github.com/HansKristian-Work/vkd3d-proton/issues/1200
- patch -Np1 -i
../0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
- patch -Np1 -i
../0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
-
- # `Xephyr :3` crashes
- # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20145
- patch -Np1 -i ../0003-d3d12-Don-t-crash-when-libd3d12.so-can-t-be-found.patch
-}
-
-build() {
- # Build only minimal debug info to reduce size
- CFLAGS+=' -g1'
- CXXFLAGS+=' -g1'
-
- arch-meson mesa-$pkgver build \
- -D b_ndebug=true \
- -D b_lto=false \
- -D platforms=x11,wayland \
- -D
gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,i915,iris,crocus,zink,d3d12
\
- -D vulkan-drivers=amd,intel,intel_hasvk,swrast \
- -D vulkan-layers=device-select,intel-nullhw,overlay \
- -D dri3=enabled \
- -D egl=enabled \
- -D gallium-extra-hud=true \
- -D gallium-nine=true \
- -D gallium-omx=bellagio \
- -D gallium-opencl=icd \
- -D gallium-va=enabled \
- -D gallium-vdpau=enabled \
- -D gallium-xa=enabled \
- -D gallium-rusticl=true \
- -D rust_std=2021 \
- -D gbm=enabled \
- -D gles1=disabled \
- -D gles2=enabled \
- -D glvnd=true \
- -D glx=dri \
- -D libunwind=enabled \
- -D llvm=enabled \
- -D lmsensors=enabled \
- -D osmesa=true \
- -D shared-glapi=enabled \
- -D microsoft-clc=disabled \
- -D video-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc \
- -D valgrind=enabled
-
- # Print config
- meson configure build
-
- ninja -C build
- meson compile -C build
-
- # fake installation to be seperated into packages
- # outside of fakeroot but mesa doesn't need to chown/mod
- DESTDIR="${srcdir}/fakeinstall" meson install -C build
-}
-
-_install() {
- local src f dir
- for src; do
- f="${src#fakeinstall/}"
- dir="${pkgdir}/${f%/*}"
- install -m755 -d "${dir}"
- mv -v "${src}" "${dir}/"
- done
-}
-
-package_vulkan-mesa-layers() {
- pkgdesc="Mesa's Vulkan layers"
- depends=('libdrm' 'libxcb' 'wayland' 'python')
- conflicts=('vulkan-mesa-layer')
- replaces=('vulkan-mesa-layer')
-
- _install fakeinstall/usr/share/vulkan/explicit_layer.d
- _install fakeinstall/usr/share/vulkan/implicit_layer.d
- _install fakeinstall/usr/lib/libVkLayer_*.so
- _install fakeinstall/usr/bin/mesa-overlay-control.py
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_opencl-mesa() {
- pkgdesc="OpenCL support with clover and rusticl for mesa drivers"
- depends=('libdrm' 'libclc' 'clang' 'expat')
- optdepends=('opencl-headers: headers necessary for OpenCL development')
- provides=('opencl-driver')
-
- _install fakeinstall/etc/OpenCL
- _install fakeinstall/usr/lib/lib*OpenCL*
- _install fakeinstall/usr/lib/gallium-pipe
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_vulkan-intel() {
- pkgdesc="Intel's Vulkan mesa driver"
- depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'zstd' 'systemd-libs')
- optdepends=('vulkan-mesa-layers: additional vulkan layers')
- provides=('vulkan-driver')
-
- _install fakeinstall/usr/share/vulkan/icd.d/intel_*.json
- _install fakeinstall/usr/lib/libvulkan_intel*.so
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_vulkan-radeon() {
- pkgdesc="Radeon's Vulkan mesa driver"
- depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs'
'systemd-libs')
- optdepends=('vulkan-mesa-layers: additional vulkan layers')
- provides=('vulkan-driver')
-
- _install fakeinstall/usr/share/drirc.d/00-radv-defaults.conf
- _install fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json
- _install fakeinstall/usr/lib/libvulkan_radeon.so
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_vulkan-swrast() {
- pkgdesc="Vulkan software rasteriser driver"
- depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'zstd' 'llvm-libs'
'systemd-libs' 'libunwind')
- optdepends=('vulkan-mesa-layers: additional vulkan layers')
- conflicts=('vulkan-mesa')
- replaces=('vulkan-mesa')
- provides=('vulkan-driver')
-
- _install fakeinstall/usr/share/vulkan/icd.d/lvp_icd*.json
- _install fakeinstall/usr/lib/libvulkan_lvp.so
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_libva-mesa-driver() {
- pkgdesc="VA-API implementation for gallium"
- depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
- depends+=('libexpat.so')
-
- _install fakeinstall/usr/lib/dri/*_drv_video.so
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_mesa-vdpau() {
- pkgdesc="Mesa VDPAU drivers"
- depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
- depends+=('libexpat.so')
-
- _install fakeinstall/usr/lib/vdpau
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_mesa() {
- depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
- 'libomxil-bellagio' 'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd'
- 'zstd' 'vulkan-icd-loader')
- depends+=('libsensors.so' 'libexpat.so' 'libvulkan.so')
- optdepends=('opengl-man-pages: for the OpenGL API man pages'
- 'mesa-vdpau: for accelerated video playback'
- 'libva-mesa-driver: for accelerated video playback')
- provides=('mesa-libgl' 'opengl-driver')
- conflicts=('mesa-libgl')
- replaces=('mesa-libgl')
-
- _install fakeinstall/usr/share/drirc.d/00-mesa-defaults.conf
- _install fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json
-
- # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast, swr
- _install fakeinstall/usr/lib/dri/*_dri.so
-
- _install fakeinstall/usr/lib/bellagio
- _install fakeinstall/usr/lib/d3d
- _install fakeinstall/usr/lib/lib{gbm,glapi}.so*
- _install fakeinstall/usr/lib/libOSMesa.so*
- _install fakeinstall/usr/lib/libxatracker.so*
-
- _install fakeinstall/usr/include
- _install fakeinstall/usr/lib/pkgconfig
-
- # libglvnd support
- _install fakeinstall/usr/lib/libGLX_mesa.so*
- _install fakeinstall/usr/lib/libEGL_mesa.so*
-
- # indirect rendering
- ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}/usr/lib/libGLX_indirect.so.0"
-
- # make sure there are no files left to install
- find fakeinstall -depth -print0 | xargs -0 rmdir
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
Copied: mesa/repos/staging-x86_64/PKGBUILD (from rev 464346,
mesa/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-12-15 05:15:48 UTC (rev 464347)
@@ -0,0 +1,225 @@
+# Maintainer: Laurent Carlier <lordhea...@gmail.com>
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Jan de Groot <j...@archlinux.org>
+# Contributor: Andreas Radke <andy...@archlinux.org>
+
+pkgbase=mesa
+pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon'
'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
+pkgdesc="An open-source implementation of the OpenGL specification"
+pkgver=22.3.1
+pkgrel=2
+arch=('x86_64')
+makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm'
'libxshmfence' 'libxxf86vm'
+ 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
'zstd' 'elfutils' 'llvm'
+ 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind'
'lm_sensors' 'libxrandr'
+ 'systemd' 'valgrind' 'glslang' 'vulkan-icd-loader'
'directx-headers' 'cmake' 'meson')
+makedepends+=('rust' 'rust-bindgen' 'spirv-tools' 'spirv-llvm-translator') #
rusticl dependencies
+url="https://www.mesa3d.org/";
+license=('custom')
+options=('debug' '!lto')
+source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
+ 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
+ LICENSE)
+sha512sums=('8a7aee67f6351de293d23425229eb7c42d6918fe9ffb46c6e5df9609f79633c98ab78e892507fe48055c51fa88bf103d7b7baa58e826b1758f66067048baed5b'
+ 'SKIP'
+
'ccdc1e367262338073b078f80795143026d08fa3fb720afda968907e1b4fa3b12e44edb441d3e17f6836f631319d1f1c3112699bea67014c3cf911fb9a816a3b'
+
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
+validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov
<emil.l.veli...@gmail.com>
+ '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez
<ta...@igalia.com>
+ 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895' # Juan Antonio
Suárez Romero (Igalia, S.L.) <jasua...@igalia.com>
+ 'A5CC9FEC93F2F837CB044912336909B6B25FADFA' # Juan A. Suarez
Romero <jasua...@igalia.com>
+ '71C4B75620BC75708B4BDB254C95FAAB3EB073EC' # Dylan Baker
<dy...@pnwbakers.com>
+ '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom
<e...@engestrom.ch>
+
+prepare() {
+ cd mesa-$pkgver
+
+ # https://gitlab.freedesktop.org/mesa/mesa/-/issues/7111
+ # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17247
+ # https://github.com/HansKristian-Work/vkd3d-proton/issues/1200
+ patch -Np1 -i
../0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
+}
+
+build() {
+ # Build only minimal debug info to reduce size
+ CFLAGS+=' -g1'
+ CXXFLAGS+=' -g1'
+
+ arch-meson mesa-$pkgver build \
+ -D b_ndebug=true \
+ -D b_lto=false \
+ -D platforms=x11,wayland \
+ -D
gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,i915,iris,crocus,zink,d3d12
\
+ -D vulkan-drivers=amd,intel,intel_hasvk,swrast \
+ -D vulkan-layers=device-select,intel-nullhw,overlay \
+ -D dri3=enabled \
+ -D egl=enabled \
+ -D gallium-extra-hud=true \
+ -D gallium-nine=true \
+ -D gallium-omx=bellagio \
+ -D gallium-opencl=icd \
+ -D gallium-va=enabled \
+ -D gallium-vdpau=enabled \
+ -D gallium-xa=enabled \
+ -D gallium-rusticl=true \
+ -D rust_std=2021 \
+ -D gbm=enabled \
+ -D gles1=disabled \
+ -D gles2=enabled \
+ -D glvnd=true \
+ -D glx=dri \
+ -D libunwind=enabled \
+ -D llvm=enabled \
+ -D lmsensors=enabled \
+ -D osmesa=true \
+ -D shared-glapi=enabled \
+ -D microsoft-clc=disabled \
+ -D video-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc \
+ -D valgrind=enabled
+
+ # Print config
+ meson configure build
+
+ ninja -C build
+ meson compile -C build
+
+ # fake installation to be seperated into packages
+ # outside of fakeroot but mesa doesn't need to chown/mod
+ DESTDIR="${srcdir}/fakeinstall" meson install -C build
+}
+
+_install() {
+ local src f dir
+ for src; do
+ f="${src#fakeinstall/}"
+ dir="${pkgdir}/${f%/*}"
+ install -m755 -d "${dir}"
+ mv -v "${src}" "${dir}/"
+ done
+}
+
+package_vulkan-mesa-layers() {
+ pkgdesc="Mesa's Vulkan layers"
+ depends=('libdrm' 'libxcb' 'wayland' 'python')
+ conflicts=('vulkan-mesa-layer')
+ replaces=('vulkan-mesa-layer')
+
+ _install fakeinstall/usr/share/vulkan/explicit_layer.d
+ _install fakeinstall/usr/share/vulkan/implicit_layer.d
+ _install fakeinstall/usr/lib/libVkLayer_*.so
+ _install fakeinstall/usr/bin/mesa-overlay-control.py
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_opencl-mesa() {
+ pkgdesc="OpenCL support with clover and rusticl for mesa drivers"
+ depends=('libdrm' 'libclc' 'clang' 'expat')
+ optdepends=('opencl-headers: headers necessary for OpenCL development')
+ provides=('opencl-driver')
+
+ _install fakeinstall/etc/OpenCL
+ _install fakeinstall/usr/lib/lib*OpenCL*
+ _install fakeinstall/usr/lib/gallium-pipe
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_vulkan-intel() {
+ pkgdesc="Intel's Vulkan mesa driver"
+ depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'zstd' 'systemd-libs')
+ optdepends=('vulkan-mesa-layers: additional vulkan layers')
+ provides=('vulkan-driver')
+
+ _install fakeinstall/usr/share/vulkan/icd.d/intel_*.json
+ _install fakeinstall/usr/lib/libvulkan_intel*.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_vulkan-radeon() {
+ pkgdesc="Radeon's Vulkan mesa driver"
+ depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs'
'systemd-libs')
+ optdepends=('vulkan-mesa-layers: additional vulkan layers')
+ provides=('vulkan-driver')
+
+ _install fakeinstall/usr/share/drirc.d/00-radv-defaults.conf
+ _install fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json
+ _install fakeinstall/usr/lib/libvulkan_radeon.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_vulkan-swrast() {
+ pkgdesc="Vulkan software rasteriser driver"
+ depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'zstd' 'llvm-libs'
'systemd-libs' 'libunwind')
+ optdepends=('vulkan-mesa-layers: additional vulkan layers')
+ conflicts=('vulkan-mesa')
+ replaces=('vulkan-mesa')
+ provides=('vulkan-driver')
+
+ _install fakeinstall/usr/share/vulkan/icd.d/lvp_icd*.json
+ _install fakeinstall/usr/lib/libvulkan_lvp.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_libva-mesa-driver() {
+ pkgdesc="VA-API implementation for gallium"
+ depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
+ depends+=('libexpat.so')
+
+ _install fakeinstall/usr/lib/dri/*_drv_video.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_mesa-vdpau() {
+ pkgdesc="Mesa VDPAU drivers"
+ depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
+ depends+=('libexpat.so')
+
+ _install fakeinstall/usr/lib/vdpau
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_mesa() {
+ depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
+ 'libomxil-bellagio' 'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd'
+ 'zstd' 'vulkan-icd-loader')
+ depends+=('libsensors.so' 'libexpat.so' 'libvulkan.so')
+ optdepends=('opengl-man-pages: for the OpenGL API man pages'
+ 'mesa-vdpau: for accelerated video playback'
+ 'libva-mesa-driver: for accelerated video playback')
+ provides=('mesa-libgl' 'opengl-driver')
+ conflicts=('mesa-libgl')
+ replaces=('mesa-libgl')
+
+ _install fakeinstall/usr/share/drirc.d/00-mesa-defaults.conf
+ _install fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json
+
+ # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast, swr
+ _install fakeinstall/usr/lib/dri/*_dri.so
+
+ _install fakeinstall/usr/lib/bellagio
+ _install fakeinstall/usr/lib/d3d
+ _install fakeinstall/usr/lib/lib{gbm,glapi}.so*
+ _install fakeinstall/usr/lib/libOSMesa.so*
+ _install fakeinstall/usr/lib/libxatracker.so*
+
+ _install fakeinstall/usr/include
+ _install fakeinstall/usr/lib/pkgconfig
+
+ # libglvnd support
+ _install fakeinstall/usr/lib/libGLX_mesa.so*
+ _install fakeinstall/usr/lib/libEGL_mesa.so*
+
+ # indirect rendering
+ ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}/usr/lib/libGLX_indirect.so.0"
+
+ # make sure there are no files left to install
+ find fakeinstall -depth -print0 | xargs -0 rmdir
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
