hasParamAttr issue has been partially solved, edited & renamed patch

3 files changed, 9 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f7f20b587a1..a851d7305adc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mesa-git
 	pkgdesc = an open-source implementation of the OpenGL specification, git version
-	pkgver = 21.3.0_devel.144688.2587fa1570e
+	pkgver = 21.3.0_devel.144763.3c18e69078a
 	pkgrel = 1
 	url = https://www.mesa3d.org
 	arch = x86_64
@@ -60,12 +60,12 @@ pkgbase = mesa-git
 	conflicts = vulkan-swrast
 	source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main
 	source = LICENSE
-	source = 12715 - use hasParamAttr instead of hasAttribute.patch
+	source = use hasParamAttr instead of hasAttribute.patch
 	md5sums = SKIP
 	md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
-	md5sums = 87cc71137f5fa8b686ff4f562dbf65d5
+	md5sums = 5fb1d94f0714863855e0c3d328f02ce4
 	sha512sums = SKIP
 	sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
-	sha512sums = 47886f0916dbf68b5cad7cd6aacfc61955d1352bff9431b0958aa17b0280e18d03b3690be872f10156a1d206560b11cf8835446df82f118ffa138acd551e47b8
+	sha512sums = 4d46d93401efde3be3d879dfb92e3d79453788a87c326968901b1702fd2ba7bda155950b9ce2958320bb0dd6f89b71573610c9f75f809fb5296b9d1355fd1e75
 
 pkgname = mesa-git
diff --git a/PKGBUILD b/PKGBUILD
index f0e738759157..00bba79dc52e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 
 pkgname=mesa-git
 pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=21.3.0_devel.144688.2587fa1570e
+pkgver=21.3.0_devel.144763.3c18e69078a
 pkgrel=1
 arch=('x86_64')
 makedepends=('git' 'python-mako' 'xorgproto'
@@ -27,13 +27,13 @@ url="https://www.mesa3d.org"
 license=('custom')
 source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main'
         'LICENSE'
-        "12715 - use hasParamAttr instead of hasAttribute.patch")
+        "use hasParamAttr instead of hasAttribute.patch")
 md5sums=('SKIP'
          '5c65a0fe315dd347e09b1f2826a1df5a'
-         '87cc71137f5fa8b686ff4f562dbf65d5')
+         '5fb1d94f0714863855e0c3d328f02ce4')
 sha512sums=('SKIP'
             '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
-            '47886f0916dbf68b5cad7cd6aacfc61955d1352bff9431b0958aa17b0280e18d03b3690be872f10156a1d206560b11cf8835446df82f118ffa138acd551e47b8')
+            '4d46d93401efde3be3d879dfb92e3d79453788a87c326968901b1702fd2ba7bda155950b9ce2958320bb0dd6f89b71573610c9f75f809fb5296b9d1355fd1e75')
 
 # NINJAFLAGS is an env var used to pass commandline options to ninja
 # NOTE: It's your responbility to validate the value of $NINJAFLAGS. If unsure, don't set it.
@@ -98,7 +98,7 @@ prepare() {
     if [  -d _build ]; then
         rm -rf _build
     fi
-    patch --directory=mesa --forward --strip=1 --input="${srcdir}/12715 - use hasParamAttr instead of hasAttribute.patch"
+    patch --directory=mesa --forward --strip=1 --input="${srcdir}/use hasParamAttr instead of hasAttribute.patch"
 }
 
 
diff --git a/12715 - use hasParamAttr instead of hasAttribute.patch b/use hasParamAttr instead of hasAttribute.patch
index 067141ff4d42..b9e64f5fb0c7 100644
--- a/12715 - use hasParamAttr instead of hasAttribute.patch
+++ b/use hasParamAttr instead of hasAttribute.patch
@@ -1,14 +1,3 @@
---- a/src/amd/llvm/ac_llvm_helper.cpp
-+++ b/src/amd/llvm/ac_llvm_helper.cpp
-@@ -60,7 +60,7 @@
-    llvm::Argument *A = llvm::unwrap<llvm::Argument>(arg);
-    llvm::AttributeList AS = A->getParent()->getAttributes();
-    unsigned ArgNo = A->getArgNo();
--   return AS.hasAttribute(ArgNo + 1, llvm::Attribute::InReg);
-+   return AS.hasParamAttr(ArgNo, llvm::Attribute::InReg);
- }
-
-
 --- a/src/gallium/frontends/clover/llvm/codegen/common.cpp
 +++ b/src/gallium/frontends/clover/llvm/codegen/common.cpp
 @@ -233,8 +233,8 @@ namespace {