Date: Friday, November 19, 2021 @ 16:57:07 Author: lcarlier Revision: 1052780
archrelease: copy trunk to multilib-testing-x86_64 Added: lib32-mesa/repos/multilib-testing-x86_64/ lib32-mesa/repos/multilib-testing-x86_64/LICENSE (from rev 1052779, lib32-mesa/trunk/LICENSE) lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD (from rev 1052779, lib32-mesa/trunk/PKGBUILD) lib32-mesa/repos/multilib-testing-x86_64/swr-llvm13-patch1.patch (from rev 1052779, lib32-mesa/trunk/swr-llvm13-patch1.patch) lib32-mesa/repos/multilib-testing-x86_64/swr-llvm13-patch2.patch (from rev 1052779, lib32-mesa/trunk/swr-llvm13-patch2.patch) -------------------------+ LICENSE | 83 +++++++++++++++++ PKGBUILD | 222 ++++++++++++++++++++++++++++++++++++++++++++++ swr-llvm13-patch1.patch | 92 +++++++++++++++++++ swr-llvm13-patch2.patch | 129 ++++++++++++++++++++++++++ 4 files changed, 526 insertions(+) Copied: lib32-mesa/repos/multilib-testing-x86_64/LICENSE (from rev 1052779, lib32-mesa/trunk/LICENSE) =================================================================== --- multilib-testing-x86_64/LICENSE (rev 0) +++ multilib-testing-x86_64/LICENSE 2021-11-19 16:57:07 UTC (rev 1052780) @@ -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/ Copied: lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD (from rev 1052779, lib32-mesa/trunk/PKGBUILD) =================================================================== --- multilib-testing-x86_64/PKGBUILD (rev 0) +++ multilib-testing-x86_64/PKGBUILD 2021-11-19 16:57:07 UTC (rev 1052780) @@ -0,0 +1,222 @@ +# 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=lib32-mesa +pkgname=('lib32-vulkan-mesa-layers' 'lib32-opencl-mesa' 'lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa') +pkgdesc="An open-source implementation of the OpenGL specification (32-bit)" +pkgver=21.3.0 +pkgrel=1 +arch=('x86_64') +makedepends=('python-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'xorgproto' 'lib32-libdrm' + 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libvdpau' + 'lib32-libva' 'lib32-wayland' 'wayland-protocols' 'lib32-zstd' 'lib32-libelf' + 'lib32-llvm' 'libclc' 'clang' 'lib32-clang' 'lib32-libglvnd' 'lib32-libunwind' + 'lib32-lm_sensors' 'lib32-libxrandr' 'lib32-vulkan-icd-loader' 'glslang' '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=('b27c0ccf2fc9b96bbece715612cec4f4e267ab25dc5386c3debd2346c385afa0146317c67a3d2eec198dbf5338fb182b458c5fe5567216b265153c0b7b560de1' + '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() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG="i686-pc-linux-gnu-pkg-config" + cat >crossfile.ini <<END +[binaries] +llvm-config = '/usr/bin/llvm-config32' +END + + # swr driver is broken with some cpu see FS#66972 + + arch-meson mesa-$pkgver build \ + --native-file crossfile.ini \ + --libdir=/usr/lib32 \ + -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 \ + -D vulkan-drivers=amd,intel \ + -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=disabled \ + -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=disabled + + # 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_lib32-vulkan-mesa-layers() { + pkgdesc="Mesa's Vulkan layers (32-bit)" + depends=('lib32-libdrm' 'lib32-libxcb' 'lib32-wayland' 'vulkan-mesa-layers') + conflicts=('lib32-vulkan-mesa-layer') + replaces=('lib32-vulkan-mesa-layer') + + rm -rv fakeinstall/usr/share/vulkan/explicit_layer.d + rm -rv fakeinstall/usr/share/vulkan/implicit_layer.d + rm -rv fakeinstall/usr/bin/mesa-overlay-control.py + + _install fakeinstall/usr/lib32/libVkLayer_*.so + + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE +} + +package_lib32-opencl-mesa() { + pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers (32-bit)" + depends=('lib32-expat' 'lib32-libdrm' 'lib32-libelf' 'lib32-clang' 'lib32-zstd' 'opencl-mesa') + optdepends=('opencl-headers: headers necessary for OpenCL development') + provides=('lib32-opencl-driver') + + rm -rv fakeinstall/etc/OpenCL + _install fakeinstall/usr/lib32/lib*OpenCL* + _install fakeinstall/usr/lib32/gallium-pipe + + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE +} + +package_lib32-vulkan-intel() { + pkgdesc="Intel's Vulkan mesa driver (32-bit)" + depends=('lib32-wayland' 'lib32-libx11' 'lib32-libxshmfence' 'lib32-libdrm' 'lib32-zstd') + optdepends=('lib32-vulkan-mesa-layers: additional vulkan layers') + provides=('lib32-vulkan-driver') + + _install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json + _install fakeinstall/usr/lib32/libvulkan_intel.so + + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE +} + +package_lib32-vulkan-radeon() { + pkgdesc="Radeon's Vulkan mesa driver (32-bit)" + depends=('lib32-wayland' 'lib32-libx11' 'lib32-libxshmfence' 'lib32-libelf' 'lib32-libdrm' + 'lib32-zstd' 'lib32-llvm-libs') + optdepends=('lib32-vulkan-mesa-layers: additional vulkan layers') + provides=('lib32-vulkan-driver') + + _install fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json + _install fakeinstall/usr/lib32/libvulkan_radeon.so + + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE +} + +package_lib32-libva-mesa-driver() { + pkgdesc="VA-API implementation for gallium (32-bit)" + depends=('lib32-libdrm' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-expat' 'lib32-libelf' + 'lib32-libxshmfence' 'lib32-zstd') + + _install fakeinstall/usr/lib32/dri/*_drv_video.so + + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE +} + +package_lib32-mesa-vdpau() { + pkgdesc="Mesa VDPAU drivers (32-bit)" + depends=('lib32-libdrm' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-expat' 'lib32-libelf' + 'lib32-libxshmfence' 'lib32-zstd') + + _install fakeinstall/usr/lib32/vdpau + + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE +} + +package_lib32-mesa() { + depends=('lib32-libdrm' 'lib32-wayland' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' + 'lib32-libelf' 'lib32-libunwind' 'lib32-llvm-libs' 'lib32-lm_sensors' 'lib32-libglvnd' + 'lib32-zstd' 'lib32-vulkan-icd-loader' 'mesa') + depends+=('libsensors.so') + optdepends=('opengl-man-pages: for the OpenGL API man pages' + 'lib32-mesa-vdpau: for accelerated video playback' + 'lib32-libva-mesa-driver: for accelerated video playback') + provides=('lib32-mesa-libgl' 'lib32-opengl-driver') + conflicts=('lib32-mesa-libgl') + replaces=('lib32-mesa-libgl') + + rm -rv fakeinstall/usr/share/drirc.d/00-mesa-defaults.conf + rm -rv fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json + + # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast, swr + _install fakeinstall/usr/lib32/dri/*_dri.so + + #_install fakeinstall/usr/lib32/bellagio + _install fakeinstall/usr/lib32/d3d + _install fakeinstall/usr/lib32/lib{gbm,glapi}.so* + _install fakeinstall/usr/lib32/libOSMesa.so* + _install fakeinstall/usr/lib32/libxatracker.so* + #_install fakeinstall/usr/lib32/libswrAVX*.so* + + rm -rv fakeinstall/usr/include + _install fakeinstall/usr/lib32/pkgconfig + + # libglvnd support + _install fakeinstall/usr/lib32/libGLX_mesa.so* + _install fakeinstall/usr/lib32/libEGL_mesa.so* + + # indirect rendering + ln -s /usr/lib32/libGLX_mesa.so.0 "${pkgdir}/usr/lib32/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: lib32-mesa/repos/multilib-testing-x86_64/swr-llvm13-patch1.patch (from rev 1052779, lib32-mesa/trunk/swr-llvm13-patch1.patch) =================================================================== --- multilib-testing-x86_64/swr-llvm13-patch1.patch (rev 0) +++ multilib-testing-x86_64/swr-llvm13-patch1.patch 2021-11-19 16:57:07 UTC (rev 1052780) @@ -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 + Copied: lib32-mesa/repos/multilib-testing-x86_64/swr-llvm13-patch2.patch (from rev 1052779, lib32-mesa/trunk/swr-llvm13-patch2.patch) =================================================================== --- multilib-testing-x86_64/swr-llvm13-patch2.patch (rev 0) +++ multilib-testing-x86_64/swr-llvm13-patch2.patch 2021-11-19 16:57:07 UTC (rev 1052780) @@ -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 +