pool/Mesa
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- update to 21.2.4

Browse Source 
* fourth bugfix release
  * 300 fixes from the new r300 maintainer! Additionally, panfrost,
    lots of crocus, some freedreno, intel, radv, core meas, gallivum,
    anv, spirv, gallim, aco, i915g, lima, and llvmpipe fixes.
- supersedes U_gallivm-add-new-wrapper-around-Module.patch,
  U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1066
This commit is contained in:
Stefan Dirsch 2021-10-15 09:22:59 +00:00 committed by Git OBS Bridge
parent 8c6bfd9623
commit 5eec58bd1c
10 changed files with 29 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Mesa-drivers.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Oct 15 09:14:11 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
- update to 21.2.4
* fourth bugfix release
* 300 fixes from the new r300 maintainer! Additionally, panfrost,
lots of crocus, some freedreno, intel, radv, core meas, gallivum,
anv, spirv, gallim, aco, i915g, lima, and llvmpipe fixes.
- supersedes U_gallivm-add-new-wrapper-around-Module.patch,
U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch
-------------------------------------------------------------------
Thu Oct 14 10:30:57 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>

8
Mesa-drivers.spec
View File

@ -41,7 +41,7 @@
%define glamor 1
%define _name_archive mesa
%define _version 21.2.3
%define _version 21.2.4
%define with_opencl 0
%define with_vulkan 0
%define with_llvm 0
@ -114,7 +114,7 @@
%endif
Name: Mesa-drivers
Version: 21.2.3
Version: 21.2.4
Release: 0
Summary: System for rendering 3-D graphics
License: MIT
@ -133,8 +133,6 @@ Patch2: n_add-Mesa-headers-again.patch
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch58: u_dep_xcb.patch
Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch
Patch101: U_gallivm-add-new-wrapper-around-Module.patch
Patch102: U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch
Patch200: u_fix-build-on-ppc64le.patch
BuildRequires: bison
BuildRequires: fdupes
@ -769,8 +767,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%endif
%patch58 -p1
%patch100 -p1
%patch101 -p1
%patch102 -p1
%patch200 -p1
# Remove requires to vulkan libs from baselibs.conf on platforms

11
Mesa.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Oct 15 09:14:11 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
- update to 21.2.4
* fourth bugfix release
* 300 fixes from the new r300 maintainer! Additionally, panfrost,
lots of crocus, some freedreno, intel, radv, core meas, gallivum,
anv, spirv, gallim, aco, i915g, lima, and llvmpipe fixes.
- supersedes U_gallivm-add-new-wrapper-around-Module.patch,
U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch
-------------------------------------------------------------------
Thu Oct 14 10:30:57 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>

8
Mesa.spec
View File

@ -40,7 +40,7 @@
%define glamor 1
%define _name_archive mesa
%define _version 21.2.3
%define _version 21.2.4
%define with_opencl 0
%define with_vulkan 0
%define with_llvm 0
@ -113,7 +113,7 @@
%endif
Name: Mesa
Version: 21.2.3
Version: 21.2.4
Release: 0
Summary: System for rendering 3-D graphics
License: MIT
@ -132,8 +132,6 @@ Patch2: n_add-Mesa-headers-again.patch
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch58: u_dep_xcb.patch
Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch
Patch101: U_gallivm-add-new-wrapper-around-Module.patch
Patch102: U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch
Patch200: u_fix-build-on-ppc64le.patch
BuildRequires: bison
BuildRequires: fdupes
@ -768,8 +766,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%endif
%patch58 -p1
%patch100 -p1
%patch101 -p1
%patch102 -p1
%patch200 -p1
# Remove requires to vulkan libs from baselibs.conf on platforms

60
U_gallivm-add-new-wrapper-around-Module.patch
View File

@ -1,60 +0,0 @@
From c1b4c64a28d9fc093229eab91a3a7fc4cb4fe29a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= <kai@dev.carbon-project.org>
Date: Thu, 22 Jul 2021 07:34:09 +0200
Subject: [PATCH 1/2] gallivm: add new wrapper around
Module::setOverrideStackAlignment()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
We need it in the next commit to replace setting the stack alignment on
i386 with LLVM >= 13 through the TargetOption::StackAlignmentOverride,
which was removed in the upstream commit
<https://github.com/llvm/llvm-project/commit/3787ee457173c3612aac4c9b1a2b6d6ab0202616>.
Unfortunately Module::setOverrideStackAlignment() is not available
through the C API and we need to wrap it ourselves.
Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Reference: mesa/mesa#4906
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11940>
---
src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 9 +++++++++
src/gallium/auxiliary/gallivm/lp_bld_misc.h | 3 +++
2 files changed, 12 insertions(+)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index 44d07fe69c6..5f52ed08fae 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -615,3 +615,12 @@ lp_is_function(LLVMValueRef v)
{
return LLVMGetValueKind(v) == LLVMFunctionValueKind;
}
+
+extern "C" void
+lp_set_module_stack_alignment_override(LLVMModuleRef MRef, unsigned align)
+{
+#if LLVM_VERSION_MAJOR >= 13
+ llvm::Module *M = llvm::unwrap(MRef);
+ M->setOverrideStackAlignment(align);
+#endif
+}
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.h b/src/gallium/auxiliary/gallivm/lp_bld_misc.h
index f2a15f19e47..fa0ce90162e 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.h
@@ -91,6 +91,9 @@ lp_is_function(LLVMValueRef v);
void
lp_free_objcache(void *objcache);
+
+void
+lp_set_module_stack_alignment_override(LLVMModuleRef M, unsigned align);
#ifdef __cplusplus
}
#endif
--
2.33.0

52
U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch
View File

@ -1,52 +0,0 @@
From 3a2d317b996f57647da23de7876142be4b9b71f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= <kai@dev.carbon-project.org>
Date: Thu, 22 Jul 2021 07:42:12 +0200
Subject: [PATCH 2/2] gallivm: fix FTBFS on i386 with LLVM >= 13,
StackAlignmentOverride is gone
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Use the newly added wrapper lp_set_module_stack_alignment_override() to
achieve the same end result.
Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Closes: mesa/mesa#4906
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11940>
---
src/gallium/auxiliary/gallivm/lp_bld_init.c | 4 ++++
src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
index 8e5fe6f24dc..d2d049ace5e 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
@@ -347,6 +347,10 @@ init_gallivm_state(struct gallivm_state *gallivm, const char *name,
if (!gallivm->module)
goto fail;
+#if defined(PIPE_ARCH_X86)
+ lp_set_module_stack_alignment_override(gallivm->module, 4);
+#endif
+
gallivm->builder = LLVMCreateBuilderInContext(gallivm->context);
if (!gallivm->builder)
goto fail;
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index 5f52ed08fae..be288ab02e2 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -350,7 +350,7 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
* friends for configuring code generation options, like stack alignment.
*/
TargetOptions options;
-#if defined(PIPE_ARCH_X86)
+#if defined(PIPE_ARCH_X86) && LLVM_VERSION_MAJOR < 13
options.StackAlignmentOverride = 4;
#endif
--
2.33.0

3
mesa-21.2.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7245284a159d2484770e1835a673e79e4322a9ddf43b17859668244946db7174
size 15780780

BIN
mesa-21.2.3.tar.xz.sig
View File

Binary file not shown.

3
mesa-21.2.4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fe6ede82d1ac02339da3c2ec1820a379641902fd351a52cc01153f76eff85b44
size 15809464

BIN
mesa-21.2.4.tar.xz.sig Normal file
View File

Binary file not shown.