From 328105545c31b54b218ab6b418c1cac1b7c3f6abfed05ca6a9fce81c37448b9a Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 19 Mar 2024 01:27:41 +0000 Subject: [PATCH] - Update to new feature release 24.0.3 * Some interesting highlights include: + New PowerVR Vulkan driver for Imagination's GPU + NVIDIA Vulkan driver NVK has seen many improvements + AMD Vulkan driver RADV ray-tracing performance improvements + Microsoft OpenGL driver D3D12 has reached OpenGL 4.6 support * New extensions & features (in no particular order): + VK_EXT_image_compression_control on RADV + VK_EXT_device_fault on RADV + OpenGL 3.3 on Asahi + Geometry shaders on Asahi + GL_ARB_texture_cube_map_array on Asahi + GL_ARB_clip_control on Asahi + GL_ARB_timer_query on Asahi + GL_EXT_disjoint_timer_query on Asahi + GL_ARB_base_instance on Asahi + OpenGL 4.6 (up from 4.2) on d3d12 + VK_EXT_depth_clamp_zero_one on RADV + GL_ARB_shader_texture_image_samples on Asahi + GL_ARB_indirect_parameters on Asahi + GL_ARB_viewport_array on Asahi + GL_ARB_fragment_layer_viewport on Asahi + GL_ARB_cull_distance on Asahi + GL_ARB_transform_feedback_overflow_query on Asahi + VK_KHR_calibrated_timestamps on RADV + VK_KHR_vertex_attribute_divisor on RADV + VK_KHR_maintenance6 on RADV + VK_KHR_ray_tracing_position_fetch on RADV + EGL_EXT_query_reset_notification_strategy - supersedes U_fix-ac-llvm-LLVM-18-remove-useless-passes.patch - adjusted n_add-Mesa-headers-again.patch, u_dep_xcb.patch - disabled python36-buildfix1.patch - removed disabled patch u_fix-build-on-ppc64le.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1271 --- Mesa.changes | 37 +++++++++++ Mesa.spec | 10 +-- ...c-llvm-LLVM-18-remove-useless-passes.patch | 58 ------------------ mesa-23.3.6.tar.xz | 3 - mesa-23.3.6.tar.xz.sig | Bin 310 -> 0 bytes mesa-24.0.3.tar.xz | 3 + mesa-24.0.3.tar.xz.sig | Bin 0 -> 310 bytes n_add-Mesa-headers-again.patch | 21 ++++--- u_dep_xcb.patch | 20 ++---- u_fix-build-on-ppc64le.patch | 42 ------------- 10 files changed, 60 insertions(+), 134 deletions(-) delete mode 100644 U_fix-ac-llvm-LLVM-18-remove-useless-passes.patch delete mode 100644 mesa-23.3.6.tar.xz delete mode 100644 mesa-23.3.6.tar.xz.sig create mode 100644 mesa-24.0.3.tar.xz create mode 100644 mesa-24.0.3.tar.xz.sig delete mode 100644 u_fix-build-on-ppc64le.patch diff --git a/Mesa.changes b/Mesa.changes index d00cb88..a90fe2d 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Mon Mar 18 23:55:51 UTC 2024 - Stefan Dirsch + +- Update to new feature release 24.0.3 + * Some interesting highlights include: + + New PowerVR Vulkan driver for Imagination's GPU + + NVIDIA Vulkan driver NVK has seen many improvements + + AMD Vulkan driver RADV ray-tracing performance improvements + + Microsoft OpenGL driver D3D12 has reached OpenGL 4.6 support + * New extensions & features (in no particular order): + + VK_EXT_image_compression_control on RADV + + VK_EXT_device_fault on RADV + + OpenGL 3.3 on Asahi + + Geometry shaders on Asahi + + GL_ARB_texture_cube_map_array on Asahi + + GL_ARB_clip_control on Asahi + + GL_ARB_timer_query on Asahi + + GL_EXT_disjoint_timer_query on Asahi + + GL_ARB_base_instance on Asahi + + OpenGL 4.6 (up from 4.2) on d3d12 + + VK_EXT_depth_clamp_zero_one on RADV + + GL_ARB_shader_texture_image_samples on Asahi + + GL_ARB_indirect_parameters on Asahi + + GL_ARB_viewport_array on Asahi + + GL_ARB_fragment_layer_viewport on Asahi + + GL_ARB_cull_distance on Asahi + + GL_ARB_transform_feedback_overflow_query on Asahi + + VK_KHR_calibrated_timestamps on RADV + + VK_KHR_vertex_attribute_divisor on RADV + + VK_KHR_maintenance6 on RADV + + VK_KHR_ray_tracing_position_fetch on RADV + + EGL_EXT_query_reset_notification_strategy +- supersedes U_fix-ac-llvm-LLVM-18-remove-useless-passes.patch +- adjusted n_add-Mesa-headers-again.patch, u_dep_xcb.patch +- disabled python36-buildfix1.patch +- removed disabled patch u_fix-build-on-ppc64le.patch + ------------------------------------------------------------------- Sat Mar 16 18:44:50 UTC 2024 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 18eb3d9..a838553 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 23.3.6 +%define _version 24.0.3 %define with_opencl 0 %define with_rusticl 0 %define with_vulkan 0 @@ -123,7 +123,7 @@ %endif Name: Mesa%{psuffix} -Version: 23.3.6 +Version: 24.0.3 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -142,12 +142,10 @@ Patch11: u_0001-intel-genxml-Drop-from-__future__-import-annotations.patc Patch12: u_0002-intel-genxml-Add-a-untyped-OrderedDict-fallback-for-.patch Patch13: python36-buildfix1.patch Patch14: python36-buildfix2.patch -Patch15: U_fix-ac-llvm-LLVM-18-remove-useless-passes.patch # never to be upstreamed 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 -Patch200: u_fix-build-on-ppc64le.patch Patch400: n_stop-iris-flicker.patch %ifarch %{ix86} x86_64 BuildRequires: DirectX-Headers @@ -759,18 +757,16 @@ rm -rf docs/README.{VMS,WIN32,OS2} # fixes build against python 3.6 %patch -P 11 -p1 %patch -P 12 -p1 -%patch -P 13 -p1 +#%patch -P 13 -p1 %if 0%{?suse_version} < 1550 %patch -P 14 -p1 %endif -%patch -P 15 -p1 # no longer needed since gstreamer-plugins-vaapi 1.18.4 %if 0%{?suse_version} < 1550 %patch -P 54 -p1 %endif %patch -P 58 -p1 %patch -P 100 -p1 -#%patch -P 200 -p1 %patch -P 400 -p1 # Remove requires to vulkan libs from baselibs.conf on platforms diff --git a/U_fix-ac-llvm-LLVM-18-remove-useless-passes.patch b/U_fix-ac-llvm-LLVM-18-remove-useless-passes.patch deleted file mode 100644 index d098739..0000000 --- a/U_fix-ac-llvm-LLVM-18-remove-useless-passes.patch +++ /dev/null @@ -1,58 +0,0 @@ -From bc7e363f8e1a26342e6fd7241c1f0ebb722338d6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= -Date: Wed, 22 Nov 2023 20:21:11 +0100 -Subject: [PATCH] fix: ac/llvm: LLVM 18: remove useless passes, partially - removed upstream -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream removed llvm::createLoopSinkPass() in commit - -and there is no useful alternative except moving to the new pass -manager. - -On top of that, the usage of this optimisation pass and -PromoteMemoryToRegisterPass were just useless, according to the -upstream developer of the commit named above. Therefore the easiest -solution is, as him, Marek and Dave suggested, to just remove these two -passes from the pipeline for now. - -Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10192 -Reference: https://github.com/llvm/llvm-project/pull/72811 -Reference: https://github.com/llvm/llvm-project/commit/b9975cec0ea0a2f10d65b7bd1197d9e1706cbd3d -Suggested-by: Dave Airlie -Suggested-by: Aiden Grossman -Suggested-by: Marek Olšák -Signed-off-by: Kai Wasserbäch -Reviewed-by: Marek Olšák -Part-of: ---- - src/amd/llvm/ac_llvm_helper.cpp | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/amd/llvm/ac_llvm_helper.cpp b/src/amd/llvm/ac_llvm_helper.cpp -index 40a4399e705..5d065279ad1 100644 ---- a/src/amd/llvm/ac_llvm_helper.cpp -+++ b/src/amd/llvm/ac_llvm_helper.cpp -@@ -299,17 +299,12 @@ LLVMPassManagerRef ac_create_passmgr(LLVMTargetLibraryInfoRef target_library_inf - */ - unwrap(passmgr)->add(createBarrierNoopPass()); - -- /* This pass eliminates all loads and stores on alloca'd pointers. */ -- unwrap(passmgr)->add(createPromoteMemoryToRegisterPass()); - #if LLVM_VERSION_MAJOR >= 16 - unwrap(passmgr)->add(createSROAPass(true)); - #else - unwrap(passmgr)->add(createSROAPass()); - #endif - /* TODO: restore IPSCCP */ -- if (LLVM_VERSION_MAJOR >= 16) -- unwrap(passmgr)->add(createLoopSinkPass()); -- /* TODO: restore IPSCCP */ - unwrap(passmgr)->add(createLICMPass()); - unwrap(passmgr)->add(createCFGSimplificationPass()); - /* This is recommended by the instruction combining pass. */ --- -2.44.0 - diff --git a/mesa-23.3.6.tar.xz b/mesa-23.3.6.tar.xz deleted file mode 100644 index f01e742..0000000 --- a/mesa-23.3.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd3d6c60121dea73abbae99d399dc2facaecde1a8c6bd647e6d85410ff4b577b -size 19455492 diff --git a/mesa-23.3.6.tar.xz.sig b/mesa-23.3.6.tar.xz.sig deleted file mode 100644 index 72a8375886a67833f4d441794823fb3c5926f75ad064f5bc75f0e7c287e033fd..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}0W$;u0SEvc79j*zRUP45mXBjW!btXwjxn#pBq*i@0%guub^r37}?T;l{lgr4( z4ee|=5<8+r(b1CyvC2MTMg{#jwAjI#G68|4EX@-t)@W5*ZipnkPu0mJ+q-eA%H%ag zcfQ5!qB3Y~26GVBK?CXWp$?a7d!D3*gls8~cTT|};i7sibQTtcC-ELH^KZT0)Va$) z038b*)GC@Ua=&Ikt5a~#2nbtM`|-42Cr9k#kJ%06bN8{D2vqBeeaK%HrTqs$TopaQ I4vm*jCNwUNi~s-t diff --git a/mesa-24.0.3.tar.xz b/mesa-24.0.3.tar.xz new file mode 100644 index 0000000..fe7ec73 --- /dev/null +++ b/mesa-24.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77aec9a2a37b7d3596ea1640b3cc53d0b5d9b3b52abed89de07e3717e91bfdbe +size 20021264 diff --git a/mesa-24.0.3.tar.xz.sig b/mesa-24.0.3.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..f1192e5ef18eb14deae5705f1e4937c8f373e27403db9503837330d4b5fcb0c5 GIT binary patch literal 310 zcmV-60m=S}0W$;u0SEvc79j*zRUP45mXBjW!btXwjxn#pBq*i@0%h_*X8;Nb5RHy8 zufrrLrslH<0E+W>JbQzhelR9=LH;Q(OE5&K?mvnpo78Cp7NmH)9W3zGyWHt+daKBm zJ&A|Cd$nw>T{Eb0rpkV3w!S(uLP+9?90U)ntUbXxZkurf1FZLH#IegLAF54#kZgt8 zsUwCTyg;FOkCP8JIVWn%dsMS{+AC6H@&OUZ1G{3$;Bp^m@}DRyv$szZBW_|t1^K; zO7jPG`ICJ6%8R$|_}rF IC>Wo;qD5?yng9R* literal 0 HcmV?d00001 diff --git a/n_add-Mesa-headers-again.patch b/n_add-Mesa-headers-again.patch index 00b3c53..bde0bbb 100644 --- a/n_add-Mesa-headers-again.patch +++ b/n_add-Mesa-headers-again.patch @@ -1,15 +1,20 @@ -Index: mesa-23.3.0/include/meson.build +Index: mesa-24.0.3/include/meson.build =================================================================== ---- mesa-23.3.0.orig/include/meson.build -+++ mesa-23.3.0/include/meson.build -@@ -28,10 +28,8 @@ if with_android_stub +--- mesa-24.0.3.orig/include/meson.build ++++ mesa-24.0.3/include/meson.build +@@ -28,7 +28,6 @@ if with_android_stub inc_include += [include_directories('android_stub')] endif --if not with_glvnd +-if not with_glvnd and host_machine.system() != 'windows' if with_gles1 or with_gles2 or with_opengl or with_egl install_headers('KHR/khrplatform.h', subdir : 'KHR') -- endif + endif +@@ -84,7 +83,6 @@ if not with_glvnd and host_machine.syste + subdir : 'EGL', + ) + endif +-endif - if with_gles1 - install_headers( + # Non-upstream headers + if with_egl diff --git a/u_dep_xcb.patch b/u_dep_xcb.patch index 759527d..5eee22e 100644 --- a/u_dep_xcb.patch +++ b/u_dep_xcb.patch @@ -1,8 +1,8 @@ -Index: mesa-23.3.0/meson.build +Index: mesa-24.0.3/meson.build =================================================================== ---- mesa-23.3.0.orig/meson.build -+++ mesa-23.3.0/meson.build -@@ -2022,9 +2022,11 @@ if with_platform_x11 +--- mesa-24.0.3.orig/meson.build ++++ mesa-24.0.3/meson.build +@@ -2069,9 +2069,11 @@ if with_platform_x11 endif endif if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm') @@ -14,15 +14,3 @@ Index: mesa-23.3.0/meson.build dep_xcb_dri3 = dependency('xcb-dri3') dep_xcb_present = dependency('xcb-present') # until xcb-dri3 has been around long enough to make a hard-dependency: -Index: mesa-23.3.0/src/loader/meson.build -=================================================================== ---- mesa-23.3.0.orig/src/loader/meson.build -+++ mesa-23.3.0/src/loader/meson.build -@@ -47,6 +47,6 @@ libloader = static_library( - c_args : loader_c_args, - gnu_symbol_visibility : 'hidden', - include_directories : [inc_include, inc_src, inc_util], -- dependencies : [dep_libdrm, dep_thread, dep_xcb_xrandr], -+ dependencies : [dep_libdrm, dep_thread, dep_xcb_xrandr, dep_xcb], - build_by_default : false, - ) diff --git a/u_fix-build-on-ppc64le.patch b/u_fix-build-on-ppc64le.patch deleted file mode 100644 index fce71c8..0000000 --- a/u_fix-build-on-ppc64le.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: mesa-23.0.0/include/CL/cl_platform.h -=================================================================== ---- mesa-23.0.0.orig/include/CL/cl_platform.h -+++ mesa-23.0.0/include/CL/cl_platform.h -@@ -385,7 +385,9 @@ typedef unsigned int cl_GLenum; - /* Define basic vector types */ - #if defined( __VEC__ ) - #if !defined(__clang__) -+ #ifndef __cplusplus - #include /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */ -+ #endif - #endif - typedef __vector unsigned char __cl_uchar16; - typedef __vector signed char __cl_char16; -Index: mesa-23.0.0/src/gallium/drivers/llvmpipe/lp_rast_tri.c -=================================================================== ---- mesa-23.0.0.orig/src/gallium/drivers/llvmpipe/lp_rast_tri.c -+++ mesa-23.0.0/src/gallium/drivers/llvmpipe/lp_rast_tri.c -@@ -488,7 +488,9 @@ lp_rast_triangle_32_3_4(struct lp_raster - - #if defined(_ARCH_PWR8) && UTIL_ARCH_LITTLE_ENDIAN - -+#ifndef __cplusplus - #include -+#endif - #include "util/u_pwr8.h" - - static inline void -Index: mesa-23.0.0/src/gallium/drivers/llvmpipe/lp_setup_tri.c -=================================================================== ---- mesa-23.0.0.orig/src/gallium/drivers/llvmpipe/lp_setup_tri.c -+++ mesa-23.0.0/src/gallium/drivers/llvmpipe/lp_setup_tri.c -@@ -46,7 +46,9 @@ - #if DETECT_ARCH_SSE - #include - #elif defined(_ARCH_PWR8) && UTIL_ARCH_LITTLE_ENDIAN -+#ifndef __cplusplus - #include -+#endif - #include "util/u_pwr8.h" - #endif -