diff --git a/0001-changed_by_upstream_26018_orcjit_patch.patch b/0001-changed_by_upstream_26018_orcjit_patch.patch index 8798217f30cbe916a021663e6b8f5240386f1715..1292f99c93f4127240ec69bbb1bce404c9a98238 100644 --- a/0001-changed_by_upstream_26018_orcjit_patch.patch +++ b/0001-changed_by_upstream_26018_orcjit_patch.patch @@ -44,8 +44,8 @@ diff --git a/meson.build b/meson.build index 5c91048..444c7d2 100644 --- a/meson.build +++ b/meson.build -@@ -1725,13 +1725,14 @@ if with_clc - llvm_optional_modules += ['all-targets', 'windowsdriver', 'frontendhlsl'] +@@ -1741,13 +1741,14 @@ + llvm_optional_modules += ['all-targets', 'windowsdriver', 'frontendhlsl', 'frontenddriver'] endif draw_with_llvm = get_option('draw-use-llvm') +llvm_with_orcjit = get_option('llvm-orcjit') @@ -55,19 +55,19 @@ index 5c91048..444c7d2 100644 llvm_optional_modules += ['lto'] endif --if with_amd_vk or with_gallium_radeonsi -+if with_amd_vk or with_gallium_radeonsi or llvm_with_orcjit +-if with_amd_vk or with_gallium_radeonsi or with_clc ++if with_amd_vk or with_gallium_radeonsi or with_clc or llvm_with_orcjit _llvm_version = '>= 15.0.0' - elif with_intel_clc - _llvm_version = '>= 13.0.0' -@@ -1815,6 +1816,7 @@ else + elif with_gallium_opencl + _llvm_version = '>= 11.0.0' +@@ -1827,6 +1828,7 @@ endif pre_args += '-DLLVM_AVAILABLE=' + (with_llvm ? '1' : '0') pre_args += '-DDRAW_LLVM_AVAILABLE=' + (with_llvm and draw_with_llvm ? '1' : '0') +pre_args += '-DGALLIVM_USE_ORCJIT=' + (with_llvm and llvm_with_orcjit ? '1' : '0') - - with_opencl_spirv = (_opencl != 'disabled' and get_option('opencl-spirv')) or with_clc - if with_opencl_spirv + + if with_clover_spirv or with_clc + chosen_llvm_version_array = dep_llvm.version().split('.') diff --git a/meson_options.txt b/meson_options.txt index 92ffd1d..38aae94 100644 --- a/meson_options.txt @@ -2362,7 +2362,7 @@ diff --git a/src/gallium/drivers/llvmpipe/lp_texture_handle.c b/src/gallium/driv index 72152ba..b805ec6 100644 --- a/src/gallium/drivers/llvmpipe/lp_texture_handle.c +++ b/src/gallium/drivers/llvmpipe/lp_texture_handle.c -@@ -201,14 +201,15 @@ llvmpipe_sampler_matrix_destroy(struct llvmpipe_context *ctx) +@@ -225,14 +225,15 @@ llvmpipe_sampler_matrix_destroy(struct llvmpipe_context *ctx) } static void * @@ -2375,12 +2375,12 @@ index 72152ba..b805ec6 100644 gallivm_compile_module(gallivm); - void *function_ptr = func_to_pointer(gallivm_jit_function(gallivm, function)); -+ void *function_ptr = func_to_pointer(gallivm_jit_function(gallivm, function, ++ void *function_ptr = func_to_pointer(gallivm_jit_function(gallivm, function, + func_name)); if (needs_caching) lp_disk_cache_insert_shader(llvmpipe_screen(ctx->pipe.screen), gallivm->cache, cache_key); -@@ -336,7 +337,7 @@ compile_image_function(struct llvmpipe_context *ctx, struct lp_static_texture_st +@@ -360,7 +361,7 @@ compile_image_function(struct llvmpipe_context *ctx, struct lp_static_texture_st free(image_soa); @@ -2389,7 +2389,7 @@ index 72152ba..b805ec6 100644 } static void * -@@ -484,7 +485,7 @@ compile_sample_function(struct llvmpipe_context *ctx, struct lp_static_texture_s +@@ -508,7 +509,7 @@ compile_sample_function(struct llvmpipe_context *ctx, struct lp_static_texture_s free(sampler_soa); @@ -2397,8 +2397,8 @@ index 72152ba..b805ec6 100644 + return compile_function(ctx, gallivm, function, "sample", needs_caching, cache_key); } - static void * -@@ -566,7 +567,7 @@ compile_size_function(struct llvmpipe_context *ctx, struct lp_static_texture_sta + static uint64_t +@@ -742,7 +743,7 @@ compile_size_function(struct llvmpipe_context *ctx, struct lp_static_texture_sta free(sampler_soa); diff --git a/mesa-24.0.3.tar.xz b/mesa-24.1.4.tar.xz similarity index 56% rename from mesa-24.0.3.tar.xz rename to mesa-24.1.4.tar.xz index 78525e206b6203463a753f7611020e57dd9172c7..42a96e5c4c84896c5a17726a89989f82c0fc66d4 100644 Binary files a/mesa-24.0.3.tar.xz and b/mesa-24.1.4.tar.xz differ diff --git a/mesa.spec b/mesa.spec index bba6a3e1d8a262bead1efe735ee74258d4323c50..5c4e0b6d4503be6b859de249fb053614df52260a 100644 --- a/mesa.spec +++ b/mesa.spec @@ -23,6 +23,9 @@ %else %define with_vulkan_hw 0 %endif +%ifarch x86_64 +%global with_intel_vk_rt 1 +%endif %ifarch %{arm} aarch64 sw_64 %define with_xa 1 @@ -51,8 +54,8 @@ Name: mesa Summary: Mesa graphics libraries -Version: 24.0.3 -Release: 2 +Version: 24.1.4 +Release: 1 License: MIT URL: http://www.mesa3d.org @@ -70,7 +73,7 @@ BuildRequires: meson >= 1.0.0 %if %{with_hardware} BuildRequires: kernel-headers %endif -BuildRequires: libdrm-devel >= 2.4.103 +BuildRequires: libdrm-devel >= 2.4.119 BuildRequires: libXxf86vm-devel BuildRequires: expat-devel BuildRequires: xorg-x11-proto-devel @@ -94,7 +97,7 @@ BuildRequires: libudev-devel BuildRequires: bison flex BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-server) -BuildRequires: pkgconfig(wayland-protocols) +BuildRequires: pkgconfig(wayland-protocols) >= 1.34 %if 0%{?with_vdpau} BuildRequires: libvdpau-devel %endif @@ -339,8 +342,9 @@ export ASFLAGS="--generate-missing-build-notes=yes" -Dgbm=enabled \ -Dglx=dri \ -Degl=enabled \ - -Dglvnd=true \ + -Dglvnd=enabled \ -Dllvm-orcjit=true \ + -Dintel-rt=%{?with_intel_vk_rt:enabled}%{!?with_intel_vk_rt:disabled} \ -Dmicrosoft-clc=disabled \ -Dllvm=enabled \ -Dshared-llvm=enabled \ @@ -408,14 +412,10 @@ done %{_includedir}/EGL/eglmesaext.h %{_includedir}/EGL/eglext_angle.h -%post libglapi -p /sbin/ldconfig -%postun libglapi -p /sbin/ldconfig %files libglapi %{_libdir}/libglapi.so.0 %{_libdir}/libglapi.so.0.* -%post libOSMesa -p /sbin/ldconfig -%postun libOSMesa -p /sbin/ldconfig %files libOSMesa %{_libdir}/libOSMesa.so.8* %files libOSMesa-devel @@ -424,8 +424,6 @@ done %{_libdir}/libOSMesa.so %{_libdir}/pkgconfig/osmesa.pc -%post libgbm -p /sbin/ldconfig -%postun libgbm -p /sbin/ldconfig %files libgbm %{_libdir}/libgbm.so.1 %{_libdir}/libgbm.so.1.* @@ -435,8 +433,6 @@ done %{_libdir}/pkgconfig/gbm.pc %if 0%{?with_xa} -%post libxatracker -p /sbin/ldconfig -%postun libxatracker -p /sbin/ldconfig %files libxatracker %if %{with_hardware} %{_libdir}/libxatracker.so.2 @@ -454,8 +450,6 @@ done %endif %if 0%{?with_opencl} -%post libOpenCL -p /sbin/ldconfig -%postun libOpenCL -p /sbin/ldconfig %files libOpenCL %{_libdir}/libMesaOpenCL.so.* %{_sysconfdir}/OpenCL/vendors/mesa.icd @@ -580,6 +574,9 @@ done %endif %changelog +* Mon Jul 22 2024 Funda Wang - 24.1.4-1 +- update to version 24.1.4 + * Mon May 20 2024 zhaojiale - 24.0.3-2 - add upstream orcjit patch and support loongarch64 orcjit