[arch-commits] Commit in lib32-mesa/trunk (4 files)

Laurent Carlier lcarlier at gemini.archlinux.org
Thu Jan 13 07:59:53 UTC 2022


    Date: Thursday, January 13, 2022 @ 07:59:53
  Author: lcarlier
Revision: 1101802

upgpkg: lib32-mesa 21.3.4-1: upstream update 21.3.4

Modified:
  lib32-mesa/trunk/PKGBUILD
Deleted:
  lib32-mesa/trunk/gbm-fix-with-old-nvidia-drivers.patch
  lib32-mesa/trunk/swr-llvm13-patch1.patch
  lib32-mesa/trunk/swr-llvm13-patch2.patch

---------------------------------------+
 PKGBUILD                              |   17 ----
 gbm-fix-with-old-nvidia-drivers.patch |   77 -------------------
 swr-llvm13-patch1.patch               |   92 ----------------------
 swr-llvm13-patch2.patch               |  129 --------------------------------
 4 files changed, 2 insertions(+), 313 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-13 07:54:08 UTC (rev 1101801)
+++ PKGBUILD	2022-01-13 07:59:53 UTC (rev 1101802)
@@ -6,7 +6,7 @@
 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.3
+pkgver=21.3.4
 pkgrel=1
 arch=('x86_64')
 makedepends=('python-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'xorgproto' 'lib32-libdrm'
@@ -17,13 +17,9 @@
 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'
+sha512sums=('7aeea3dba0d39f4ac9f23c54aa0e6853d48000f50c4dd484618c28debe705cdd765ae8fafb5ddea0773976f7189849d9128be3f2282fea74394b59019cb786b9'
             'SKIP'
-            '073ea2bb4778b3151717b26e0ec737abb4916ea340c7193a7382c2e2197534e93e95622d530e2f731ae156fd6ca1fc86f315f6ecae0baaeab88846773fb98bba'
-            'b59f18f4bc69b872e97b5f33a53b9c2398143bc1d0a1b42787ca2a0c204fc11b2837ca40f6f773a0b1bd49756754f9d755ac14d4eb10df6269570477ba8484fc'
             'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov at gmail.com>
               '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <tanty at igalia.com>
@@ -32,15 +28,6 @@
               '71C4B75620BC75708B4BDB254C95FAAB3EB073EC'  # Dylan Baker <dylan at pnwbakers.com>
               '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric at 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"

Deleted: gbm-fix-with-old-nvidia-drivers.patch
===================================================================
--- gbm-fix-with-old-nvidia-drivers.patch	2022-01-13 07:54:08 UTC (rev 1101801)
+++ gbm-fix-with-old-nvidia-drivers.patch	2022-01-13 07:59:53 UTC (rev 1101802)
@@ -1,77 +0,0 @@
-From 873ce884fd217f2ca2a5fe9764b65e75102124d6 Mon Sep 17 00:00:00 2001
-From: James Jones <jajones at nvidia.com>
-Date: Fri, 19 Nov 2021 11:50:18 -0800
-Subject: [PATCH] gbm: Don't pass default usage flags on ABIs < 1
-
-Older drivers will not expect any flags from the
-GBM front-end when modifiers are in use, and will
-likely fail the allocation or handle them
-incorrectly as a result. Only specify usage flags
-when allocating from a backend with an ABI >= 1,
-as that's the ABI version that added support for
-specifying usage flags along with modifiers.
-
-Fixes: d50b47a14e9 ("gbm: assume USE_SCANOUT in create_with_modifiers")
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5709
-Signed-off-by: James Jones <jajones at nvidia.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14049>
----
- src/gbm/main/gbm.c | 32 ++++++++++++++++++++++++++++++--
- 1 file changed, 30 insertions(+), 2 deletions(-)
-
-diff --git a/src/gbm/main/gbm.c b/src/gbm/main/gbm.c
-index 476a03cb5b8..6b1b3248142 100644
---- a/src/gbm/main/gbm.c
-+++ b/src/gbm/main/gbm.c
-@@ -500,8 +500,22 @@ gbm_bo_create_with_modifiers(struct gbm_device *gbm,
-                              const uint64_t *modifiers,
-                              const unsigned int count)
- {
-+   uint32_t flags = 0;
-+
-+   /*
-+    * ABI version 1 added the modifiers+flags capability. Backends from
-+    * prior versions may fail if "unknown" flags are provided along with
-+    * modifiers, but assume scanout is required when modifiers are used.
-+    * Newer backends expect scanout to be explicitly requested if required,
-+    * but applications using this older interface rely on the older implied
-+    * requirement, so that behavior must be preserved.
-+    */
-+   if (gbm->v0.backend_version >= 1) {
-+      flags |= GBM_BO_USE_SCANOUT;
-+   }
-+
-    return gbm_bo_create_with_modifiers2(gbm, width, height, format, modifiers,
--                                        count, GBM_BO_USE_SCANOUT);
-+                                        count, flags);
- }
- 
- GBM_EXPORT struct gbm_bo *
-@@ -651,9 +665,23 @@ gbm_surface_create_with_modifiers(struct gbm_device *gbm,
-                                   const uint64_t *modifiers,
-                                   const unsigned int count)
- {
-+   uint32_t flags = 0;
-+
-+   /*
-+    * ABI version 1 added the modifiers+flags capability. Backends from
-+    * prior versions may fail if "unknown" flags are provided along with
-+    * modifiers, but assume scanout is required when modifiers are used.
-+    * Newer backends expect scanout to be explicitly requested if required,
-+    * but applications using this older interface rely on the older implied
-+    * requirement, so that behavior must be preserved.
-+    */
-+   if (gbm->v0.backend_version >= 1) {
-+      flags |= GBM_BO_USE_SCANOUT;
-+   }
-+
-    return gbm_surface_create_with_modifiers2(gbm, width, height, format,
-                                              modifiers, count,
--                                             GBM_BO_USE_SCANOUT);
-+                                             flags);
- }
- 
- GBM_EXPORT struct gbm_surface *
--- 
-GitLab
-

Deleted: swr-llvm13-patch1.patch
===================================================================
--- swr-llvm13-patch1.patch	2022-01-13 07:54:08 UTC (rev 1101801)
+++ swr-llvm13-patch1.patch	2022-01-13 07:59:53 UTC (rev 1101802)
@@ -1,92 +0,0 @@
-From a20dc1dd150a6c31153197ceda01827daab4203e Mon Sep 17 00:00:00 2001
-From: Vinson Lee <vlee at 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 <vlee at 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	2022-01-13 07:54:08 UTC (rev 1101801)
+++ swr-llvm13-patch2.patch	2022-01-13 07:59:53 UTC (rev 1101802)
@@ -1,129 +0,0 @@
-From 98859f67c3d54c9c6d8bbf55251717cbe3511f4e Mon Sep 17 00:00:00 2001
-From: Grigory Vasilyev <h0tc0d3 at 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
-



More information about the arch-commits mailing list