Date: Friday, December 31, 2021 @ 09:53:32
Author: lcarlier
Revision: 433279
archrelease: copy trunk to testing-x86_64
Added:
mesa/repos/testing-x86_64/LICENSE
(from rev 433278, mesa/trunk/LICENSE)
mesa/repos/testing-x86_64/PKGBUILD
(from rev 433278, mesa/trunk/PKGBUILD)
mesa/repos/testing-x86_64/swr-llvm13-patch1.patch
(from rev 433278, mesa/trunk/swr-llvm13-patch1.patch)
mesa/repos/testing-x86_64/swr-llvm13-patch2.patch
(from rev 433278, mesa/trunk/swr-llvm13-patch2.patch)
Deleted:
mesa/repos/testing-x86_64/LICENSE
mesa/repos/testing-x86_64/PKGBUILD
mesa/repos/testing-x86_64/swr-llvm13-patch1.patch
mesa/repos/testing-x86_64/swr-llvm13-patch2.patch
-------------------------+
LICENSE | 166 ++++++++---------
PKGBUILD | 428 ++++++++++++++++++++++------------------------
swr-llvm13-patch1.patch | 184 +++++++++----------
swr-llvm13-patch2.patch | 258 +++++++++++++--------------
4 files changed, 511 insertions(+), 525 deletions(-)
Deleted: LICENSE
===================================================================
--- LICENSE 2021-12-31 09:53:26 UTC (rev 433278)
+++ LICENSE 2021-12-31 09:53:32 UTC (rev 433279)
@@ -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/testing-x86_64/LICENSE (from rev 433278, mesa/trunk/LICENSE)
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2021-12-31 09:53:32 UTC (rev 433279)
@@ -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 2021-12-31 09:53:26 UTC (rev 433278)
+++ PKGBUILD 2021-12-31 09:53:32 UTC (rev 433279)
@@ -1,221 +0,0 @@
-# Maintainer: Laurent Carlier <lordhea...@gmail.com>
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Maintainer: 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=21.3.3
-pkgrel=1
-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'
- 'valgrind' 'glslang' 'vulkan-icd-loader' 'cmake' 'meson')
-url="https://www.mesa3d.org/";
-license=('custom')
-source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
- swr-llvm13-patch1.patch
- swr-llvm13-patch2.patch
- LICENSE)
-sha512sums=('0263d75435f8c16d40eba3eae29bf372e8994816718deec153c582a17c4dd6ef1c67b3236ed31e63f98bf4e1089fac5cfafae9fb84d3e1fa919b274f43e7e673'
- 'SKIP'
-
'073ea2bb4778b3151717b26e0ec737abb4916ea340c7193a7382c2e2197534e93e95622d530e2f731ae156fd6ca1fc86f315f6ecae0baaeab88846773fb98bba'
-
'b59f18f4bc69b872e97b5f33a53b9c2398143bc1d0a1b42787ca2a0c204fc11b2837ca40f6f773a0b1bd49756754f9d755ac14d4eb10df6269570477ba8484fc'
-
'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/-/merge_requests/11568
- patch -Np1 -i ../swr-llvm13-patch1.patch
- # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13267
- patch -Np1 -i ../swr-llvm13-patch2.patch
-}
-
-build() {
- arch-meson mesa-$pkgver build \
- -D b_lto=true \
- -D b_ndebug=true \
- -D platforms=x11,wayland \
- -D dri-drivers=i915,i965,r100,r200,nouveau \
- -D
gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,swr,iris,crocus,zink
\
- -D vulkan-drivers=amd,intel,swrast \
- -D vulkan-layers=device-select,intel-nullhw,overlay \
- -D swr-arches=avx,avx2 \
- -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-xvmc=disabled \
- -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 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 for AMD/ATI Radeon mesa drivers"
- depends=('libdrm' 'libclc' 'clang')
- 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')
- optdepends=('vulkan-mesa-layers: additional vulkan layers')
- provides=('vulkan-driver')
-
- _install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.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')
- optdepends=('vulkan-mesa-layers: additional vulkan layers')
- provides=('vulkan-driver')
-
- _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')
- 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/lib/libswrAVX*.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/testing-x86_64/PKGBUILD (from rev 433278,
mesa/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-31 09:53:32 UTC (rev 433279)
@@ -0,0 +1,207 @@
+# Maintainer: Laurent Carlier <lordhea...@gmail.com>
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Maintainer: 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=21.3.3
+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'
+ 'valgrind' 'glslang' 'vulkan-icd-loader' 'directx-headers'
'cmake' 'meson')
+url="https://www.mesa3d.org/";
+license=('custom')
+source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
+ LICENSE)
+sha512sums=('0263d75435f8c16d40eba3eae29bf372e8994816718deec153c582a17c4dd6ef1c67b3236ed31e63f98bf4e1089fac5cfafae9fb84d3e1fa919b274f43e7e673'
+ 'SKIP'
+
'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>
+
+build() {
+ arch-meson mesa-$pkgver build \
+ -D b_lto=true \
+ -D b_ndebug=true \
+ -D platforms=x11,wayland \
+ -D dri-drivers=i915,i965,r100,r200,nouveau \
+ -D
gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris,crocus,zink,d3d12
\
+ -D vulkan-drivers=amd,intel,swrast \
+ -D vulkan-layers=device-select,intel-nullhw,overlay \
+ -D swr-arches=avx,avx2 \
+ -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-xvmc=disabled \
+ -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 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 for AMD/ATI Radeon mesa drivers"
+ depends=('libdrm' 'libclc' 'clang')
+ 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')
+ optdepends=('vulkan-mesa-layers: additional vulkan layers')
+ provides=('vulkan-driver')
+
+ _install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.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')
+ optdepends=('vulkan-mesa-layers: additional vulkan layers')
+ provides=('vulkan-driver')
+
+ _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')
+ 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
+}
Deleted: swr-llvm13-patch1.patch
===================================================================
--- swr-llvm13-patch1.patch 2021-12-31 09:53:26 UTC (rev 433278)
+++ swr-llvm13-patch1.patch 2021-12-31 09:53:32 UTC (rev 433279)
@@ -1,92 +0,0 @@
-From a20dc1dd150a6c31153197ceda01827daab4203e Mon Sep 17 00:00:00 2001
-From: Vinson Lee <v...@freedesktop.org>
-Date: Wed, 23 Jun 2021 21:58:08 -0700
-Subject: [PATCH] swr: Fix build with llvm-13.
-
-Fix build after llvm-13 commit 3302af9d4c39 ("Support: Remove
-F_{None,Text,Append} compatibility synonyms, NFC").
-
-Signed-off-by: Vinson Lee <v...@freedesktop.org>
----
- .../swr/rasterizer/jitter/JitManager.cpp | 24 +++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
-index 44482939c76..2487f754dc1 100644
---- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
-+++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
-@@ -437,7 +437,11 @@ void JitManager::DumpAsm(Function* pFunction, const char*
fileName)
- sprintf(fName, "%s.%s.asm", funcName, fileName);
- #endif
-
-+#if LLVM_VERSION_MAJOR >= 13
-+ raw_fd_ostream filestream(fName, EC, llvm::sys::fs::OF_None);
-+#else
- raw_fd_ostream filestream(fName, EC, llvm::sys::fs::F_None);
-+#endif
-
- legacy::PassManager* pMPasses = new legacy::PassManager();
- auto* pTarget = mpExec->getTargetMachine();
-@@ -490,7 +494,11 @@ void JitManager::DumpToFile(Module*
M,
- #else
- sprintf(fName, "%s.%s.ll", funcName, fileName);
- #endif
-+#if LLVM_VERSION_MAJOR >= 13
-+ raw_fd_ostream fd(fName, EC, llvm::sys::fs::OF_None);
-+#else
- raw_fd_ostream fd(fName, EC, llvm::sys::fs::F_None);
-+#endif
- M->print(fd, annotater);
- fd.flush();
- }
-@@ -512,7 +520,11 @@ void JitManager::DumpToFile(Function* f, const char*
fileName)
- #else
- sprintf(fName, "%s.%s.ll", funcName, fileName);
- #endif
-+#if LLVM_VERSION_MAJOR >= 13
-+ raw_fd_ostream fd(fName, EC, llvm::sys::fs::OF_None);
-+#else
- raw_fd_ostream fd(fName, EC, llvm::sys::fs::F_None);
-+#endif
- f->print(fd, nullptr);
-
- #if defined(_WIN32)
-@@ -522,7 +534,11 @@ void JitManager::DumpToFile(Function* f, const char*
fileName)
- #endif
- fd.flush();
-
-+#if LLVM_VERSION_MAJOR >= 13
-+ raw_fd_ostream fd_cfg(fName, EC, llvm::sys::fs::OF_Text);
-+#else
- raw_fd_ostream fd_cfg(fName, EC, llvm::sys::fs::F_Text);
-+#endif
- WriteGraph(fd_cfg, (const Function*)f);
-
- fd_cfg.flush();
-@@ -726,7 +742,11 @@ void JitCache::notifyObjectCompiled(const llvm::Module*
M, llvm::MemoryBufferRef
-
- {
- std::error_code err;
-+#if LLVM_VERSION_MAJOR >= 13
-+ llvm::raw_fd_ostream fileObj(objPath.c_str(), err,
llvm::sys::fs::OF_None);
-+#else
- llvm::raw_fd_ostream fileObj(objPath.c_str(), err,
llvm::sys::fs::F_None);
-+#endif
- fileObj << Obj.getBuffer();
- fileObj.flush();
- }
-@@ -734,7 +754,11 @@ void JitCache::notifyObjectCompiled(const llvm::Module*
M, llvm::MemoryBufferRef
-
- {
- std::error_code err;
-+#if LLVM_VERSION_MAJOR >= 13
-+ llvm::raw_fd_ostream fileObj(filePath.c_str(), err,
llvm::sys::fs::OF_None);
-+#else
- llvm::raw_fd_ostream fileObj(filePath.c_str(), err,
llvm::sys::fs::F_None);
-+#endif
-
- uint32_t objcrc = ComputeCRC(0, Obj.getBufferStart(),
Obj.getBufferSize());
-
---
-GitLab
-
Copied: mesa/repos/testing-x86_64/swr-llvm13-patch1.patch (from rev 433278,
mesa/trunk/swr-llvm13-patch1.patch)
===================================================================
--- swr-llvm13-patch1.patch (rev 0)
+++ swr-llvm13-patch1.patch 2021-12-31 09:53:32 UTC (rev 433279)
@@ -0,0 +1,92 @@
+From a20dc1dd150a6c31153197ceda01827daab4203e Mon Sep 17 00:00:00 2001
+From: Vinson Lee <v...@freedesktop.org>
+Date: Wed, 23 Jun 2021 21:58:08 -0700
+Subject: [PATCH] swr: Fix build with llvm-13.
+
+Fix build after llvm-13 commit 3302af9d4c39 ("Support: Remove
+F_{None,Text,Append} compatibility synonyms, NFC").
+
+Signed-off-by: Vinson Lee <v...@freedesktop.org>
+---
+ .../swr/rasterizer/jitter/JitManager.cpp | 24 +++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
+index 44482939c76..2487f754dc1 100644
+--- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
++++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
+@@ -437,7 +437,11 @@ void JitManager::DumpAsm(Function* pFunction, const char*
fileName)
+ sprintf(fName, "%s.%s.asm", funcName, fileName);
+ #endif
+
++#if LLVM_VERSION_MAJOR >= 13
++ raw_fd_ostream filestream(fName, EC, llvm::sys::fs::OF_None);
++#else
+ raw_fd_ostream filestream(fName, EC, llvm::sys::fs::F_None);
++#endif
+
+ legacy::PassManager* pMPasses = new legacy::PassManager();
+ auto* pTarget = mpExec->getTargetMachine();
+@@ -490,7 +494,11 @@ void JitManager::DumpToFile(Module*
M,
+ #else
+ sprintf(fName, "%s.%s.ll", funcName, fileName);
+ #endif
++#if LLVM_VERSION_MAJOR >= 13
++ raw_fd_ostream fd(fName, EC, llvm::sys::fs::OF_None);
++#else
+ raw_fd_ostream fd(fName, EC, llvm::sys::fs::F_None);
++#endif
+ M->print(fd, annotater);
+ fd.flush();
+ }
+@@ -512,7 +520,11 @@ void JitManager::DumpToFile(Function* f, const char*
fileName)
+ #else
+ sprintf(fName, "%s.%s.ll", funcName, fileName);
+ #endif
++#if LLVM_VERSION_MAJOR >= 13
++ raw_fd_ostream fd(fName, EC, llvm::sys::fs::OF_None);
++#else
+ raw_fd_ostream fd(fName, EC, llvm::sys::fs::F_None);
++#endif
+ f->print(fd, nullptr);
+
+ #if defined(_WIN32)
+@@ -522,7 +534,11 @@ void JitManager::DumpToFile(Function* f, const char*
fileName)
+ #endif
+ fd.flush();
+
++#if LLVM_VERSION_MAJOR >= 13
++ raw_fd_ostream fd_cfg(fName, EC, llvm::sys::fs::OF_Text);
++#else
+ raw_fd_ostream fd_cfg(fName, EC, llvm::sys::fs::F_Text);
++#endif
+ WriteGraph(fd_cfg, (const Function*)f);
+
+ fd_cfg.flush();
+@@ -726,7 +742,11 @@ void JitCache::notifyObjectCompiled(const llvm::Module*
M, llvm::MemoryBufferRef
+
+ {
+ std::error_code err;
++#if LLVM_VERSION_MAJOR >= 13
++ llvm::raw_fd_ostream fileObj(objPath.c_str(), err,
llvm::sys::fs::OF_None);
++#else
+ llvm::raw_fd_ostream fileObj(objPath.c_str(), err,
llvm::sys::fs::F_None);
++#endif
+ fileObj << Obj.getBuffer();
+ fileObj.flush();
+ }
+@@ -734,7 +754,11 @@ void JitCache::notifyObjectCompiled(const llvm::Module*
M, llvm::MemoryBufferRef
+
+ {
+ std::error_code err;
++#if LLVM_VERSION_MAJOR >= 13
++ llvm::raw_fd_ostream fileObj(filePath.c_str(), err,
llvm::sys::fs::OF_None);
++#else
+ llvm::raw_fd_ostream fileObj(filePath.c_str(), err,
llvm::sys::fs::F_None);
++#endif
+
+ uint32_t objcrc = ComputeCRC(0, Obj.getBufferStart(),
Obj.getBufferSize());
+
+--
+GitLab
+
Deleted: swr-llvm13-patch2.patch
===================================================================
--- swr-llvm13-patch2.patch 2021-12-31 09:53:26 UTC (rev 433278)
+++ swr-llvm13-patch2.patch 2021-12-31 09:53:32 UTC (rev 433279)
@@ -1,129 +0,0 @@
-From 98859f67c3d54c9c6d8bbf55251717cbe3511f4e Mon Sep 17 00:00:00 2001
-From: Grigory Vasilyev <h0tc...@gmail.com>
-Date: Fri, 8 Oct 2021 15:26:49 +0300
-Subject: [PATCH] Fix swr build with LLVM 13
-
----
- .../swr/rasterizer/jitter/builder_mem.cpp | 12 +++++++++++
- .../swr/rasterizer/jitter/builder_mem.h | 4 ++++
- src/gallium/drivers/swr/swr_shader.cpp | 20 ++++++++++++++-----
- 3 files changed, 31 insertions(+), 5 deletions(-)
-
-diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
-index b5eb0a782b1..ff0672cfd14 100644
---- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
-+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
-@@ -82,7 +82,11 @@ namespace SwrJit
- std::vector<Value*> indices;
- for (auto i : indexList)
- indices.push_back(i);
-+#if LLVM_VERSION_MAJOR >= 13
-+ return IN_BOUNDS_GEP(ptr->getType(), ptr, indices);
-+#else
- return IN_BOUNDS_GEP(ptr, indices);
-+#endif
- }
-
- Value* Builder::IN_BOUNDS_GEP(Value* ptr, const
std::initializer_list<uint32_t>& indexList)
-@@ -90,7 +94,11 @@ namespace SwrJit
- std::vector<Value*> indices;
- for (auto i : indexList)
- indices.push_back(C(i));
-+#if LLVM_VERSION_MAJOR >= 13
-+ return IN_BOUNDS_GEP(ptr->getType(), ptr, indices);
-+#else
- return IN_BOUNDS_GEP(ptr, indices);
-+#endif
- }
-
- LoadInst* Builder::LOAD(Value* Ptr, const char* Name, Type* Ty,
MEM_CLIENT usage)
-@@ -234,7 +242,11 @@ namespace SwrJit
- /// @param pVecPassthru - SIMD wide vector of values to load when lane is
inactive
- Value* Builder::GATHER_PTR(Value* pVecSrcPtr, Value* pVecMask, Value*
pVecPassthru)
- {
-+#if LLVM_VERSION_MAJOR >= 13
-+ return MASKED_GATHER(pVecSrcPtr->getType(), pVecSrcPtr, AlignType(4),
pVecMask, pVecPassthru);
-+#else
- return MASKED_GATHER(pVecSrcPtr, AlignType(4), pVecMask,
pVecPassthru);
-+#endif
- }
-
- void Builder::SCATTER_PTR(Value* pVecDstPtr, Value* pVecSrc, Value*
pVecMask)
-diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
-index 429d5779a4d..c6cfb812b81 100644
---- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
-+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
-@@ -84,7 +84,11 @@ virtual CallInst* MASKED_LOAD(Value* Ptr,
- Type* Ty = nullptr,
- MEM_CLIENT usage =
MEM_CLIENT::MEM_CLIENT_INTERNAL)
- {
-+#if LLVM_VERSION_MAJOR >= 13
-+ return IRB()->CreateMaskedLoad(Ptr->getType(), Ptr, AlignType(Align),
Mask, PassThru, Name);
-+#else
- return IRB()->CreateMaskedLoad(Ptr, AlignType(Align), Mask, PassThru,
Name);
-+#endif
- }
-
- virtual StoreInst* STORE(Value *Val, Value *Ptr, bool isVolatile = false,
Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL)
-diff --git a/src/gallium/drivers/swr/swr_shader.cpp
b/src/gallium/drivers/swr/swr_shader.cpp
-index 315036920fb..26e967759cd 100644
---- a/src/gallium/drivers/swr/swr_shader.cpp
-+++ b/src/gallium/drivers/swr/swr_shader.cpp
-@@ -1553,7 +1553,9 @@ BuilderSWR::CompileGS(struct swr_context *ctx,
swr_jit_gs_key &key)
- GlobalValue::ExternalLinkage,
- "GS",
- JM()->mpCurrentModule);
--#if LLVM_VERSION_MAJOR < 5
-+#if LLVM_VERSION_MAJOR >= 13
-+ pFunction->addParamAttrs(AttributeList::FunctionIndex, attrBuilder);
-+#elif LLVM_VERSION_MAJOR < 5
- AttributeSet attrSet = AttributeSet::get(
- JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
- pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);
-@@ -1781,7 +1783,9 @@ BuilderSWR::CompileTES(struct swr_context *ctx,
swr_jit_tes_key &key)
- "TES",
- JM()->mpCurrentModule);
-
--#if LLVM_VERSION_MAJOR < 5
-+#if LLVM_VERSION_MAJOR >= 13
-+ pFunction->addParamAttrs(AttributeList::FunctionIndex, attrBuilder);
-+#elif LLVM_VERSION_MAJOR < 5
- AttributeSet attrSet = AttributeSet::get(
- JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
- pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);
-@@ -2082,7 +2086,9 @@ BuilderSWR::CompileTCS(struct swr_context *ctx,
swr_jit_tcs_key &key)
- "TCS",
- JM()->mpCurrentModule);
-
--#if LLVM_VERSION_MAJOR < 5
-+#if LLVM_VERSION_MAJOR >= 13
-+ pFunction->addParamAttrs(AttributeList::FunctionIndex, attrBuilder);
-+#elif LLVM_VERSION_MAJOR < 5
- AttributeSet attrSet = AttributeSet::get(
- JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
- pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);
-@@ -2337,7 +2343,9 @@ BuilderSWR::CompileVS(struct swr_context *ctx,
swr_jit_vs_key &key)
- GlobalValue::ExternalLinkage,
- "VS",
- JM()->mpCurrentModule);
--#if LLVM_VERSION_MAJOR < 5
-+#if LLVM_VERSION_MAJOR >= 13
-+ pFunction->addParamAttrs(AttributeList::FunctionIndex, attrBuilder);
-+#elif LLVM_VERSION_MAJOR < 5
- AttributeSet attrSet = AttributeSet::get(
- JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
- pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);
-@@ -2642,7 +2650,9 @@ BuilderSWR::CompileFS(struct swr_context *ctx,
swr_jit_fs_key &key)
- GlobalValue::ExternalLinkage,
- "FS",
- JM()->mpCurrentModule);
--#if LLVM_VERSION_MAJOR < 5
-+#if LLVM_VERSION_MAJOR >= 13
-+ pFunction->addParamAttrs(AttributeList::FunctionIndex, attrBuilder);
-+#elif LLVM_VERSION_MAJOR < 5
- AttributeSet attrSet = AttributeSet::get(
- JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
- pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);
---
-GitLab
-
Copied: mesa/repos/testing-x86_64/swr-llvm13-patch2.patch (from rev 433278,
mesa/trunk/swr-llvm13-patch2.patch)
===================================================================
--- swr-llvm13-patch2.patch (rev 0)
+++ swr-llvm13-patch2.patch 2021-12-31 09:53:32 UTC (rev 433279)
@@ -0,0 +1,129 @@
+From 98859f67c3d54c9c6d8bbf55251717cbe3511f4e Mon Sep 17 00:00:00 2001
+From: Grigory Vasilyev <h0tc...@gmail.com>
+Date: Fri, 8 Oct 2021 15:26:49 +0300
+Subject: [PATCH] Fix swr build with LLVM 13
+
+---
+ .../swr/rasterizer/jitter/builder_mem.cpp | 12 +++++++++++
+ .../swr/rasterizer/jitter/builder_mem.h | 4 ++++
+ src/gallium/drivers/swr/swr_shader.cpp | 20 ++++++++++++++-----
+ 3 files changed, 31 insertions(+), 5 deletions(-)
+
+diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
+index b5eb0a782b1..ff0672cfd14 100644
+--- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
++++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
+@@ -82,7 +82,11 @@ namespace SwrJit
+ std::vector<Value*> indices;
+ for (auto i : indexList)
+ indices.push_back(i);
++#if LLVM_VERSION_MAJOR >= 13
++ return IN_BOUNDS_GEP(ptr->getType(), ptr, indices);
++#else
+ return IN_BOUNDS_GEP(ptr, indices);
++#endif
+ }
+
+ Value* Builder::IN_BOUNDS_GEP(Value* ptr, const
std::initializer_list<uint32_t>& indexList)
+@@ -90,7 +94,11 @@ namespace SwrJit
+ std::vector<Value*> indices;
+ for (auto i : indexList)
+ indices.push_back(C(i));
++#if LLVM_VERSION_MAJOR >= 13
++ return IN_BOUNDS_GEP(ptr->getType(), ptr, indices);
++#else
+ return IN_BOUNDS_GEP(ptr, indices);
++#endif
+ }
+
+ LoadInst* Builder::LOAD(Value* Ptr, const char* Name, Type* Ty,
MEM_CLIENT usage)
+@@ -234,7 +242,11 @@ namespace SwrJit
+ /// @param pVecPassthru - SIMD wide vector of values to load when lane is
inactive
+ Value* Builder::GATHER_PTR(Value* pVecSrcPtr, Value* pVecMask, Value*
pVecPassthru)
+ {
++#if LLVM_VERSION_MAJOR >= 13
++ return MASKED_GATHER(pVecSrcPtr->getType(), pVecSrcPtr, AlignType(4),
pVecMask, pVecPassthru);
++#else
+ return MASKED_GATHER(pVecSrcPtr, AlignType(4), pVecMask,
pVecPassthru);
++#endif
+ }
+
+ void Builder::SCATTER_PTR(Value* pVecDstPtr, Value* pVecSrc, Value*
pVecMask)
+diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
+index 429d5779a4d..c6cfb812b81 100644
+--- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
++++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
+@@ -84,7 +84,11 @@ virtual CallInst* MASKED_LOAD(Value* Ptr,
+ Type* Ty = nullptr,
+ MEM_CLIENT usage =
MEM_CLIENT::MEM_CLIENT_INTERNAL)
+ {
++#if LLVM_VERSION_MAJOR >= 13
++ return IRB()->CreateMaskedLoad(Ptr->getType(), Ptr, AlignType(Align),
Mask, PassThru, Name);
++#else
+ return IRB()->CreateMaskedLoad(Ptr, AlignType(Align), Mask, PassThru,
Name);
++#endif
+ }
+
+ virtual StoreInst* STORE(Value *Val, Value *Ptr, bool isVolatile = false,
Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL)
+diff --git a/src/gallium/drivers/swr/swr_shader.cpp
b/src/gallium/drivers/swr/swr_shader.cpp
+index 315036920fb..26e967759cd 100644
+--- a/src/gallium/drivers/swr/swr_shader.cpp
++++ b/src/gallium/drivers/swr/swr_shader.cpp
+@@ -1553,7 +1553,9 @@ BuilderSWR::CompileGS(struct swr_context *ctx,
swr_jit_gs_key &key)
+ GlobalValue::ExternalLinkage,
+ "GS",
+ JM()->mpCurrentModule);
+-#if LLVM_VERSION_MAJOR < 5
++#if LLVM_VERSION_MAJOR >= 13
++ pFunction->addParamAttrs(AttributeList::FunctionIndex, attrBuilder);
++#elif LLVM_VERSION_MAJOR < 5
+ AttributeSet attrSet = AttributeSet::get(
+ JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
+ pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);
+@@ -1781,7 +1783,9 @@ BuilderSWR::CompileTES(struct swr_context *ctx,
swr_jit_tes_key &key)
+ "TES",
+ JM()->mpCurrentModule);
+
+-#if LLVM_VERSION_MAJOR < 5
++#if LLVM_VERSION_MAJOR >= 13
++ pFunction->addParamAttrs(AttributeList::FunctionIndex, attrBuilder);
++#elif LLVM_VERSION_MAJOR < 5
+ AttributeSet attrSet = AttributeSet::get(
+ JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
+ pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);
+@@ -2082,7 +2086,9 @@ BuilderSWR::CompileTCS(struct swr_context *ctx,
swr_jit_tcs_key &key)
+ "TCS",
+ JM()->mpCurrentModule);
+
+-#if LLVM_VERSION_MAJOR < 5
++#if LLVM_VERSION_MAJOR >= 13
++ pFunction->addParamAttrs(AttributeList::FunctionIndex, attrBuilder);
++#elif LLVM_VERSION_MAJOR < 5
+ AttributeSet attrSet = AttributeSet::get(
+ JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
+ pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);
+@@ -2337,7 +2343,9 @@ BuilderSWR::CompileVS(struct swr_context *ctx,
swr_jit_vs_key &key)
+ GlobalValue::ExternalLinkage,
+ "VS",
+ JM()->mpCurrentModule);
+-#if LLVM_VERSION_MAJOR < 5
++#if LLVM_VERSION_MAJOR >= 13
++ pFunction->addParamAttrs(AttributeList::FunctionIndex, attrBuilder);
++#elif LLVM_VERSION_MAJOR < 5
+ AttributeSet attrSet = AttributeSet::get(
+ JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
+ pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);
+@@ -2642,7 +2650,9 @@ BuilderSWR::CompileFS(struct swr_context *ctx,
swr_jit_fs_key &key)
+ GlobalValue::ExternalLinkage,
+ "FS",
+ JM()->mpCurrentModule);
+-#if LLVM_VERSION_MAJOR < 5
++#if LLVM_VERSION_MAJOR >= 13
++ pFunction->addParamAttrs(AttributeList::FunctionIndex, attrBuilder);
++#elif LLVM_VERSION_MAJOR < 5
+ AttributeSet attrSet = AttributeSet::get(
+ JM()->mContext, AttributeSet::FunctionIndex, attrBuilder);
+ pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet);
+--
+GitLab
+
