开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 6

_service:tar_scm:mesa.spec Changed

@@ -1,285 +1,269 @@
-%ifnarch s390x
-%global with_hardware 1
-%global with_vulkan_hw 1
-%global with_vdpau 1
-%global with_va 1
-%global with_nine 1
-%global with_omx 1
-%global with_opencl 1
-%global with_r300 1
-%global with_r600 1
-%global with_radeonsi 1
-%global with_vmware 1
-%global base_vulkan ,amd
+%global llvm_toolset %{nil}
+%global llvm_pkg_prefix %{nil}
+%global vendor_name rust-bindgen-0.64.0
+%global vendor_bidngen 0
+
+%ifarch s390x
+%define with_hardware 0
+%else
+%define with_hardware 1
+%define with_vdpau 1
+%define with_omx 1
+%define with_opencl 1
+%define with_vaapi 1
+%define with_nine 1
+%define with_rusticl 1
 %endif
 
 %ifarch %{ix86} x86_64
-%global with_crocus 1
-%global with_i915   1
-%global with_iris   1
-%global with_xa     1
-%global platform_vulkan ,intel,intel_hasvk
+%define platform_drivers i965
+%define with_vmware 1
+%define with_xa     1
+%define with_iris   1
+%define with_crocus 1
 %endif
- 
-%ifarch aarch64
-%global with_etnaviv   1
-%global with_lima      1
-%global with_vc4       1
-%global with_v3d       1
-%global with_freedreno 1
-%global with_kmsro     1
-%global with_panfrost  1
-%global with_tegra     1
-%global with_xa        1
-%global platform_vulkan ,broadcom,freedreno,panfrost
+
+%ifarch %{ix86} x86_64
+%define with_vulkan_hw 1
+%else
+%define with_vulkan_hw 0
 %endif
- 
-%ifarch riscv64
-%global with_xa        1
+
+%ifarch %{arm} aarch64 sw_64
+%define with_xa        1
 %endif
 
-%ifarch %{valgrind_arches}
-%bcond_without valgrind
+%ifarch %{arm} riscv64
+%define with_xa        1
+%define with_vmware    1
+%endif
+
+%global dri_drivers %{?platform_drivers}
+
+%if 0%{?with_vulkan_hw}
+%define vulkan_drivers swrast,intel,amd,intel_hasvk
 %else
-%bcond_with valgrind
+%define vulkan_drivers swrast,amd
 %endif
- 
-%global vulkan_drivers swrast%{?base_vulkan}%{?platform_vulkan}
- 
+
+%global sanitize 0
+
 Name:           mesa
 Summary:        Mesa graphics libraries
-%global ver 22.3.2
-Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
+Version:        23.0.0
 Release:        1
+
 License:        MIT
 URL:            http://www.mesa3d.org
+Source0:        https://mesa.freedesktop.org/archive/%{name}-%{version}.tar.xz
+Source1:        vendor.tar.xz
 
-Source0:        https://archive.mesa3d.org/mesa-%{ver}.tar.xz
-# src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license.
- 
-Patch0:        0001-llvmpipe-add-an-implementation-with-llvm-orcjit.patch
-Patch1:        0002-llvmpipe-add-riscv-support-in-orcjit.patch
-Patch2:        lp_init_clock_hook.patch
+Patch0:         0001-llvmpipe-add-an-implementation-with-llvm-orcjit.patch
+Patch1:         0002-llvmpipe-add-riscv-support-in-orcjit.patch
+Patch2:         0003-llvmpipe-make-unnamed-global-have-internal-linkage.patch
+Patch3:         U_glx-fix-indirect-initialization-crash.patch
 
-BuildRequires:  meson >= 0.61.4
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
-BuildRequires:  gettext
-%if 0%{?with_hardware}
+
+BuildRequires:  meson >= 1.0.0
+%if %{with_hardware}
 BuildRequires:  kernel-headers
 %endif
-# We only check for the minimum version of pkgconfig(libdrm) needed so that the
-# SRPMs for each arch still have the same build dependencies. See:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1859515
-BuildRequires:  pkgconfig(libdrm) >= 2.4.97
-BuildRequires:  pkgconfig(libclc)
-BuildRequires:  pkgconfig(expat)
-BuildRequires:  pkgconfig(zlib) >= 1.2.3
-BuildRequires:  pkgconfig(libselinux)
-BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(wayland-protocols) >= 1.8
-BuildRequires:  pkgconfig(wayland-client) >= 1.11
-BuildRequires:  pkgconfig(wayland-server) >= 1.11
-BuildRequires:  pkgconfig(wayland-egl-backend) >= 3
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xdamage) >= 1.1
-BuildRequires:  pkgconfig(xfixes)
-BuildRequires:  pkgconfig(xcb-glx) >= 1.8.1
-BuildRequires:  pkgconfig(xxf86vm)
-BuildRequires:  pkgconfig(xcb)
-BuildRequires:  pkgconfig(x11-xcb)
-BuildRequires:  pkgconfig(xcb-dri2) >= 1.8
-BuildRequires:  pkgconfig(xcb-dri3)
-BuildRequires:  pkgconfig(xcb-present)
-BuildRequires:  pkgconfig(xcb-sync)
-BuildRequires:  pkgconfig(xshmfence) >= 1.1
-BuildRequires:  pkgconfig(dri2proto) >= 2.8
-BuildRequires:  pkgconfig(glproto) >= 1.4.14
-BuildRequires:  pkgconfig(xcb-xfixes)
-BuildRequires:  pkgconfig(xcb-randr)
-BuildRequires:  pkgconfig(xrandr) >= 1.3
-BuildRequires:  bison
-BuildRequires:  flex
+BuildRequires:  libdrm-devel >= 2.4.103
+BuildRequires:  libXxf86vm-devel
+BuildRequires:  expat-devel
+BuildRequires:  xorg-x11-proto-devel
+BuildRequires:  libselinux-devel
+BuildRequires:  libXext-devel
+BuildRequires:  libXfixes-devel
+BuildRequires:  libXdamage-devel
+BuildRequires:  libXi-devel
+BuildRequires:  libXrandr-devel
+BuildRequires:  libXmu-devel
+BuildRequires:  libxshmfence-devel
+BuildRequires:  elfutils
+BuildRequires:  python3-devel
+BuildRequires:  gettext
+BuildRequires: %{llvm_pkg_prefix}llvm-devel >= 3.4-7
+BuildRequires: elfutils-libelf-devel
+BuildRequires: libudev-devel
+BuildRequires: bison flex
+BuildRequires: pkgconfig(wayland-client)
+BuildRequires: pkgconfig(wayland-server)
+BuildRequires: pkgconfig(wayland-protocols)
 %if 0%{?with_vdpau}
-BuildRequires:  pkgconfig(vdpau) >= 1.1
+BuildRequires: libvdpau-devel
 %endif
-%if 0%{?with_va}
-BuildRequires:  pkgconfig(libva) >= 0.38.0
+%if 0%{?with_vaapi}
+BuildRequires: libva-devel
 %endif
+BuildRequires: pkgconfig(zlib)
 %if 0%{?with_omx}
-BuildRequires:  pkgconfig(libomxil-bellagio)
+BuildRequires: libomxil-bellagio-devel
 %endif
-BuildRequires:  pkgconfig(libelf)
-BuildRequires:  pkgconfig(libglvnd) >= 1.3.2
 %if 0%{?with_opencl}
-BuildRequires:  llvm-devel >= 7.0.0
+BuildRequires:  libclc-devel opencl-filesystem
 BuildRequires:  clang-devel
-BuildRequires:  rust-packaging
 BuildRequires:  pkgconfig(libclc)

_service:tar_scm:0001-llvmpipe-add-an-implementation-with-llvm-orcjit.patch Changed

@@ -1,5 +1,43 @@
+From 74208472dbde3481a714075e3c065445d2af5264 Mon Sep 17 00:00:00 2001
+From: Alex Fan <alex.fan.q@gmail.com>
+Date: Tue, 28 Jun 2022 15:51:24 +0000
+Subject: PATCH llvmpipe: add an implementation with llvm orcjit
+
+no per-func perf nor disasm is implemented yet.
+disk cache is also left empty
+---
+ src/gallium/auxiliary/draw/draw_context.c     |   4 +
+ src/gallium/auxiliary/draw/draw_llvm.c        |  94 +-
+ src/gallium/auxiliary/draw/draw_llvm.h        |  27 +-
+ src/gallium/auxiliary/gallivm/lp_bld_coro.c   |   6 +-
+ src/gallium/auxiliary/gallivm/lp_bld_coro.h   |   8 +
+ src/gallium/auxiliary/gallivm/lp_bld_init.c   |   9 +-
+ src/gallium/auxiliary/gallivm/lp_bld_init.h   |  42 +-
+ .../auxiliary/gallivm/lp_bld_init_orc.cpp     | 875 ++++++++++++++++++
+ src/gallium/auxiliary/meson.build             |   2 +-
+ src/gallium/drivers/llvmpipe/lp_context.c     |  14 +
+ src/gallium/drivers/llvmpipe/lp_context.h     |   4 +
+ src/gallium/drivers/llvmpipe/lp_screen.c      |   4 +
+ src/gallium/drivers/llvmpipe/lp_state_cs.c    |  19 +
+ src/gallium/drivers/llvmpipe/lp_state_cs.h    |   3 +
+ src/gallium/drivers/llvmpipe/lp_state_fs.c    |  33 +
+ src/gallium/drivers/llvmpipe/lp_state_fs.h    |   6 +
+ .../llvmpipe/lp_state_fs_linear_llvm.c        |   4 +
+ src/gallium/drivers/llvmpipe/lp_state_setup.c |   9 +
+ src/gallium/drivers/llvmpipe/lp_state_setup.h |   3 +
+ src/gallium/drivers/llvmpipe/lp_test_arit.c   |  19 +
+ src/gallium/drivers/llvmpipe/lp_test_blend.c  |  33 +-
+ src/gallium/drivers/llvmpipe/lp_test_conv.c   |  33 +-
+ src/gallium/drivers/llvmpipe/lp_test_format.c |  50 +-
+ .../llvmpipe/lp_test_lookup_multiple.c        | 173 ++++
+ src/gallium/drivers/llvmpipe/lp_test_printf.c |  31 +-
+ src/gallium/drivers/llvmpipe/meson.build      |   2 +-
+ 26 files changed, 1487 insertions(+), 20 deletions(-)
+ create mode 100644 src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp
+ create mode 100644 src/gallium/drivers/llvmpipe/lp_test_lookup_multiple.c
+
 diff --git a/src/gallium/auxiliary/draw/draw_context.c b/src/gallium/auxiliary/draw/draw_context.c
-index 81ceefc..4fdd7f3 100644
+index 81ceefc32bb..4fdd7f319b6 100644
 --- a/src/gallium/auxiliary/draw/draw_context.c
 +++ b/src/gallium/auxiliary/draw/draw_context.c
 @@ -76,7 +76,11 @@ draw_create_context(struct pipe_context *pipe, void *context,
@@ -15,7 +53,7 @@
  #endif
  
 diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c
-index 50c157b..e029cc7 100644
+index 50c157bc3cc..563fc91fea1 100644
 --- a/src/gallium/auxiliary/draw/draw_llvm.c
 +++ b/src/gallium/auxiliary/draw/draw_llvm.c
 @@ -766,8 +766,13 @@ get_vertex_header_ptr_type(struct draw_llvm_variant *variant)
@@ -195,13 +233,11 @@
  
     create_tcs_jit_types(variant);
  
-@@ -3631,10 +3696,18 @@ draw_tcs_llvm_create_variant(struct draw_llvm *llvm,
+@@ -3631,10 +3696,16 @@ draw_tcs_llvm_create_variant(struct draw_llvm *llvm,
  
     draw_tcs_llvm_generate(llvm, variant);
  
 +#if GALLIVM_USE_ORCJIT == 1
-+   lp_build_coro_add_malloc_hooks(variant->gallivm);
-+
 +   gallivm_compile_module(variant->gallivm);
 +   variant->jit_func = (draw_tcs_jit_func)
 +      gallivm_jit_function(variant->gallivm, variant->function_name);
@@ -214,7 +250,7 @@
  
     if (needs_caching)
        llvm->draw->disk_cache_insert_shader(llvm->draw->disk_cache_cookie,
-@@ -3667,6 +3740,10 @@ draw_tcs_llvm_destroy_variant(struct draw_tcs_llvm_variant *variant)
+@@ -3667,6 +3738,10 @@ draw_tcs_llvm_destroy_variant(struct draw_tcs_llvm_variant *variant)
     variant->shader->variants_cached--;
     list_del(&variant->list_item_global.list);
     llvm->nr_tcs_variants--;
@@ -225,7 +261,7 @@
     FREE(variant);
  }
  
-@@ -3961,6 +4038,10 @@ draw_tes_llvm_generate(struct draw_llvm *llvm,
+@@ -3961,6 +4036,10 @@ draw_tes_llvm_generate(struct draw_llvm *llvm,
     variant_func = LLVMAddFunction(gallivm->module, func_name, func_type);
  
     variant->function = variant_func;
@@ -236,7 +272,7 @@
     LLVMSetFunctionCallConv(variant_func, LLVMCCallConv);
  
     for (i = 0; i < ARRAY_SIZE(arg_types); ++i)
-@@ -4151,7 +4232,11 @@ draw_tes_llvm_create_variant(struct draw_llvm *llvm,
+@@ -4151,7 +4230,11 @@ draw_tes_llvm_create_variant(struct draw_llvm *llvm,
        if (!cached.data_size)
           needs_caching = true;
     }
@@ -248,7 +284,7 @@
  
     create_tes_jit_types(variant);
  
-@@ -4167,8 +4252,13 @@ draw_tes_llvm_create_variant(struct draw_llvm *llvm,
+@@ -4167,8 +4250,13 @@ draw_tes_llvm_create_variant(struct draw_llvm *llvm,
  
     gallivm_compile_module(variant->gallivm);
  
@@ -262,7 +298,7 @@
  
     if (needs_caching)
        llvm->draw->disk_cache_insert_shader(llvm->draw->disk_cache_cookie,
-@@ -4201,6 +4291,10 @@ draw_tes_llvm_destroy_variant(struct draw_tes_llvm_variant *variant)
+@@ -4201,6 +4289,10 @@ draw_tes_llvm_destroy_variant(struct draw_tes_llvm_variant *variant)
     variant->shader->variants_cached--;
     list_del(&variant->list_item_global.list);
     llvm->nr_tes_variants--;
@@ -274,7 +310,7 @@
  }
  
 diff --git a/src/gallium/auxiliary/draw/draw_llvm.h b/src/gallium/auxiliary/draw/draw_llvm.h
-index f82a6a6..1a2f08d 100644
+index f82a6a61112..1a2f08d43b1 100644
 --- a/src/gallium/auxiliary/draw/draw_llvm.h
 +++ b/src/gallium/auxiliary/draw/draw_llvm.h
 @@ -41,6 +41,11 @@
@@ -355,7 +391,7 @@
  void
  draw_llvm_destroy(struct draw_llvm *llvm);
 diff --git a/src/gallium/auxiliary/gallivm/lp_bld_coro.c b/src/gallium/auxiliary/gallivm/lp_bld_coro.c
-index 0214dcf..f5a2b31 100644
+index 0214dcf6742..f5a2b31b6d9 100644
 --- a/src/gallium/auxiliary/gallivm/lp_bld_coro.c
 +++ b/src/gallium/auxiliary/gallivm/lp_bld_coro.c
 @@ -156,12 +156,14 @@ coro_free(char *ptr)
@@ -375,12 +411,36 @@
  }
  
  void lp_build_coro_declare_malloc_hooks(struct gallivm_state *gallivm)
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_coro.h b/src/gallium/auxiliary/gallivm/lp_bld_coro.h
+index e3cf415230e..070f9756bb4 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_coro.h
++++ b/src/gallium/auxiliary/gallivm/lp_bld_coro.h
+@@ -26,6 +26,10 @@
+ #ifndef LP_BLD_CORO_H
+ #define LP_BLD_CORO_H
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ #include <stdbool.h>
+ #include "pipe/p_compiler.h"
+ #include "gallivm/lp_bld.h"
+@@ -84,4 +88,8 @@ static inline void lp_build_coro_add_presplit(LLVMValueRef coro)
+ #endif
+ }
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif
 diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
-index 584ea73..9cc8a2c 100644
+index 1782f9dd189..09e0c4f85e7 100644
 --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
 +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
-@@ -543,6 +543,12 @@ void lp_init_clock_hook(struct gallivm_state *gallivm)
-    gallivm->get_time_hook = LLVMAddFunction(gallivm->module, "get_time_hook", get_time_type);
+@@ -534,6 +534,12 @@ gallivm_verify_function(struct gallivm_state *gallivm,
+    }
  }
  
 +void
@@ -389,22 +449,21 @@
 +   LLVMAddGlobalMapping(gallivm->engine, sym, addr);
 +}
 +
- /**
-  * Compile a module.
-  * This does IR optimization on all functions in the module.
-@@ -664,7 +670,9 @@ gallivm_compile_module(struct gallivm_state *gallivm)
+ void lp_init_clock_hook(struct gallivm_state *gallivm)
+ {
+    if (gallivm->get_time_hook)
+@@ -664,7 +670,8 @@ gallivm_compile_module(struct gallivm_state *gallivm)
     ++gallivm->compiled;
  
     lp_init_printf_hook(gallivm);
 -   LLVMAddGlobalMapping(gallivm->engine, gallivm->debug_printf_hook, debug_printf);
 +   if (gallivm->debug_printf_hook)
 +      gallivm_add_global_mapping(gallivm, gallivm->debug_printf_hook, debug_printf);
-+ 
  
     lp_init_clock_hook(gallivm);
     LLVMAddGlobalMapping(gallivm->engine, gallivm->get_time_hook, os_time_get_nano);
 diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.h b/src/gallium/auxiliary/gallivm/lp_bld_init.h
-index ca267a3..722f46d 100644
+index ca267a36f92..c0ca4cb0008 100644
 --- a/src/gallium/auxiliary/gallivm/lp_bld_init.h
 +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.h
 @@ -29,11 +29,16 @@

_service:tar_scm:0002-llvmpipe-add-riscv-support-in-orcjit.patch Changed

@@ -1,41 +1,32 @@
-From 6b006934c394ae9501cce56bc05c696ed575784c Mon Sep 17 00:00:00 2001
+From cbbc9cf1b69b48ed59e825bc0579f0cfaa5485e6 Mon Sep 17 00:00:00 2001
 From: Alex Fan <alex.fan.q@gmail.com>
 Date: Fri, 29 Jul 2022 12:44:14 +1000
-Subject: PATCH 2/2 llvmpipe: add riscv support in orcjit
+Subject: PATCH llvmpipe: add riscv support in orcjit
 
 assume cpu supports extension +i,+m,+a,+f,+d,+c
 ---
- .../auxiliary/gallivm/lp_bld_init_orc.cpp     | 60 ++++++++++++++++++-
- src/gallium/include/pipe/p_config.h           | 10 ++++
- 2 files changed, 68 insertions(+), 2 deletions(-)
+ .../auxiliary/gallivm/lp_bld_init_orc.cpp     | 58 ++++++++++++++++++-
+ src/util/detect_arch.h                        | 16 +++++
+ 2 files changed, 73 insertions(+), 1 deletion(-)
 
 diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp
-index 62ec382f795..b422f282fe2 100644
+index bf6ae10533b..4e976d6f2c5 100644
 --- a/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp
 +++ b/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp
-@@ -45,7 +45,7 @@
+@@ -48,7 +48,7 @@
  /* conflict with ObjectLinkingLayer.h */
  #include "util/u_memory.h"
  
 -#if (defined(_WIN32) && LLVM_VERSION_MAJOR >= 15)
-+#if defined(PIPE_ARCH_RISCV64) || defined(PIPE_ARCH_RISCV32) || (defined(_WIN32) && LLVM_VERSION_MAJOR >= 15)
++#if DETECT_ARCH_RISCV64 || DETECT_ARCH_RISCV32 || (defined(_WIN32) && LLVM_VERSION_MAJOR >= 15)
  /* use ObjectLinkingLayer (JITLINK backend) */
  #define USE_JITLINK
  #endif
-@@ -216,7 +216,7 @@ public:
-       using llvm::orc::ExecutorAddr;
-       JITDylib* JD = ::unwrap(jd);
-       auto func = ExitOnErr(LPJit::get_instance()->lljit->lookup(*JD, func_name));
--#if LLVM_VERSION_MAJOR >= 16
-+#if LLVM_VERSION_MAJOR >= 15
-       return func.toPtr<void *>();
- #else
-       return (void *)(func.getAddress());
-@@ -552,6 +552,30 @@ llvm::orc::JITTargetMachineBuilder LPJit::create_jtdb() {
+@@ -528,6 +528,30 @@ llvm::orc::JITTargetMachineBuilder LPJit::create_jtdb() {
     options.StackAlignmentOverride = 4;
  #endif
  
-+#if defined(PIPE_ARCH_RISCV64)
++#if DETECT_ARCH_RISCV64
 +#if defined(__riscv_float_abi_soft)
 +   options.MCOptions.ABIName = "lp64";
 +#elif defined(__riscv_float_abi_single)
@@ -47,7 +38,7 @@
 +#endif
 +#endif
 +
-+#if defined(PIPE_ARCH_RISCV32)
++#if DETECT_ARCH_RISCV32
 +#if defined(__riscv_float_abi_soft)
 +   options.MCOptions.ABIName = "ilp32";
 +#elif defined(__riscv_float_abi_single)
@@ -62,11 +53,11 @@
     JTMB.setOptions(options);
  
     std::vector<std::string> MAttrs;
-@@ -650,6 +674,14 @@ llvm::orc::JITTargetMachineBuilder LPJit::create_jtdb() {
+@@ -626,6 +650,14 @@ llvm::orc::JITTargetMachineBuilder LPJit::create_jtdb() {
     MAttrs.push_back("+fp64");
  #endif
  
-+#if defined(PIPE_ARCH_RISCV64)
++#if DETECT_ARCH_RISCV64
 +   /* Before riscv is more matured and util_get_cpu_caps() is implemented,
 +    * assume this for now since most of linux capable riscv machine are
 +    * riscv64gc
@@ -77,11 +68,11 @@
     JTMB.addFeatures(MAttrs);
  
     if (gallivm_debug & (GALLIVM_DEBUG_IR | GALLIVM_DEBUG_ASM | GALLIVM_DEBUG_DUMP_BC)) {
-@@ -717,6 +749,30 @@ llvm::orc::JITTargetMachineBuilder LPJit::create_jtdb() {
+@@ -693,6 +725,30 @@ llvm::orc::JITTargetMachineBuilder LPJit::create_jtdb() {
        MCPU = util_get_cpu_caps()->has_msa ? "mips64r5" : "mips64r2";
  #endif
  
-+#if defined(PIPE_ARCH_RISCV64)
++#if DETECT_ARCH_RISCV64
 +   /**
 +    * should be fixed with https://reviews.llvm.org/D121149 in llvm 15,
 +    * set it anyway for llvm 14
@@ -93,7 +84,7 @@
 +   JTMB.setRelocationModel(Reloc::PIC_);
 +#endif
 +
-+#if defined(PIPE_ARCH_RISCV32)
++#if DETECT_ARCH_RISCV32
 +   /**
 +    * should be fixed with https://reviews.llvm.org/D121149 in llvm 15,
 +    * set it anyway for llvm 14
@@ -108,27 +99,38 @@
     JTMB.setCPU(MCPU);
     if (gallivm_debug & (GALLIVM_DEBUG_IR | GALLIVM_DEBUG_ASM | GALLIVM_DEBUG_DUMP_BC)) {
        debug_printf("llc -mcpu option: %s\n", MCPU.c_str());
-diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h
-index f35a7dc9f04..3674932a956 100644
---- a/src/gallium/include/pipe/p_config.h
-+++ b/src/gallium/include/pipe/p_config.h
-@@ -125,6 +125,16 @@
- #define  PIPE_ARCH_MIPS
+diff --git a/src/util/detect_arch.h b/src/util/detect_arch.h
+index 334358fcc26..34c0928216d 100644
+--- a/src/util/detect_arch.h
++++ b/src/util/detect_arch.h
+@@ -97,6 +97,14 @@
+ #define DETECT_ARCH_MIPS 1
  #endif
  
 +#if defined(__riscv)
 +#if __riscv_xlen == 64
-+#define PIPE_ARCH_RISCV64
++#define DETECT_ARCH_RISCV64 1
 +#elif __riscv_xlen == 32
-+#define PIPE_ARCH_RISCV32
-+#else
-+#error "pipe: unknown target riscv xlen"
++#define DETECT_ARCH_RISCV32 1
++#endif
++#endif
++
+ #ifndef DETECT_ARCH_X86
+ #define DETECT_ARCH_X86 0
+ #endif
+@@ -137,4 +145,12 @@
+ #define DETECT_ARCH_MIPS 0
+ #endif
+ 
++#ifndef DETECT_ARCH_RISCV32
++#define DETECT_ARCH_RISCV32 0
 +#endif
++
++#ifndef DETECT_ARCH_RISCV64
++#define DETECT_ARCH_RISCV64 0
 +#endif
 +
- /*
-  * Endian detection.
-  */
+ #endif /* UTIL_DETECT_ARCH_H_ */
 -- 
-2.38.1
+2.39.1

_service:tar_scm:0003-llvmpipe-make-unnamed-global-have-internal-linkage.patch Added

@@ -0,0 +1,29 @@
+From f5fd902716a5d9feccb958d0792ddcda514e72f2 Mon Sep 17 00:00:00 2001
+From: Alex Fan <alex.fan.q@gmail.com>
+Date: Mon, 28 Nov 2022 22:29:44 +1100
+Subject: PATCH llvmpipe: make unnamed global have internal linkage
+
+work around bug https://github.com/llvm/llvm-project/issues/54813
+Being unnamed makes it not useable from other module, therefore
+changing to internal linkage is safe
+
+Signed-off-by: Alex Fan <alex.fan.q@gmail.com>
+---
+ src/gallium/drivers/llvmpipe/lp_state_fs.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
+index 533f402b053..19c4d652af6 100644
+--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
++++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
+@@ -3306,6 +3306,7 @@ generate_fragment(struct llvmpipe_context *lp,
+       LLVMValueRef glob_sample_pos =
+          LLVMAddGlobal(gallivm->module,
+                        LLVMArrayType(flt_type, key->coverage_samples * 2), "");
++      LLVMSetLinkage(glob_sample_pos, LLVMInternalLinkage);
+       LLVMValueRef sample_pos_array;
+ 
+       if (key->multisample && key->coverage_samples == 4) {
+-- 
+2.39.1
+

_service:tar_scm:U_glx-fix-indirect-initialization-crash.patch Added

@@ -0,0 +1,55 @@
+From 1eab7e69e2ba84244f551f6901f4307a687a9504 Mon Sep 17 00:00:00 2001
+From: Illia Polishchuk <illia.a.polishchuk@globallogic.com>
+Date: Tue, 28 Feb 2023 16:07:59 +0200
+Subject: PATCH glx: fix indirect initialization crash
+
+Fixes: b090246a ("glx: Only compute client GL extensions for indirect contexts")
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8393
+
+Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+Signed-off-by: Illia Polishchuk <illia.a.polishchuk@globallogic.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21591>
+---
+ src/glx/glxext.c       | 9 ++++++++-
+ src/glx/indirect_glx.c | 1 -
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/glx/glxext.c b/src/glx/glxext.c
+index 755a75ab568..4b3496b5a14 100644
+--- a/src/glx/glxext.c
++++ b/src/glx/glxext.c
+@@ -813,10 +813,17 @@ AllocAndFetchScreenConfigs(Display * dpy, struct glx_display * priv)
+       if (psc == NULL)
+          psc = applegl_create_screen(i, priv);
+ #else
++      bool indirect = false;
+       if (psc == NULL)
+-	 psc = indirect_create_screen(i, priv);
++      {
++         psc = indirect_create_screen(i, priv);
++         indirect = true;
++      }
+ #endif
+       priv->screensi = psc;
++
++      if(indirect) /* Load extensions required only for indirect glx */
++         glxSendClientInfo(priv, i);
+    }
+    SyncHandle();
+    return GL_TRUE;
+diff --git a/src/glx/indirect_glx.c b/src/glx/indirect_glx.c
+index dc3464fc99e..abe561f700b 100644
+--- a/src/glx/indirect_glx.c
++++ b/src/glx/indirect_glx.c
+@@ -365,7 +365,6 @@ indirect_create_screen(int screen, struct glx_display * priv)
+       return NULL;
+ 
+    glx_screen_init(psc, screen, priv);
+-   glxSendClientInfo(priv, screen);
+    psc->vtable = &indirect_screen_vtable;
+ 
+    return psc;
+-- 
+2.35.3
+

_service:tar_scm:lp_init_clock_hook.patch Deleted

_service Changed

_service:tar_scm:mesa-22.3.2.tar.xz -> _service:tar_scm:mesa-23.0.0.tar.xz Changed

_service:tar_scm:vendor.tar.xz Added