diff --git a/spec_files/mesa/0001-broadcom-compiler-needs_quad_helper_invocation-enabl.patch b/spec_files/mesa/0001-broadcom-compiler-needs_quad_helper_invocation-enabl.patch deleted file mode 100644 index a2971a09..00000000 --- a/spec_files/mesa/0001-broadcom-compiler-needs_quad_helper_invocation-enabl.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 97f5721bfc4bbbce5c3a39cf48eeb6ad1fb9cf97 Mon Sep 17 00:00:00 2001 -From: Jose Maria Casanova Crespo -Date: Mon, 15 Apr 2024 12:22:31 +0200 -Subject: [PATCH] broadcom/compiler: needs_quad_helper_invocation enable - PER_QUAD TMU access - -We take advantage of the needs_quad_helper_invocation information to -only enable the PER_QUAD TMU access on Fragment Shaders when it is needed. - -PER_QUAD access is also disabled on stages different to fragment shader. -Being enabled was causing MMU errors when TMU was doing indexed by vertexid -reads on disabled lanes on vertex stage. This problem was exercised by some -shaders from the GTK new GSK_RENDERER=ngl that were accessing a constant buffer -offset[6], but having PER_QUAD enabled on the TMU access by VertexID was -doing hidden incorrect access to not existing vertex 6 and 7 as TMU was -accessing the full quad. - -cc: mesa-stable - -Reviewed-by: Iago Toral Quiroga -Part-of: ---- - src/broadcom/compiler/nir_to_vir.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/broadcom/compiler/nir_to_vir.c b/src/broadcom/compiler/nir_to_vir.c -index ff98e4b5961..0303ca96103 100644 ---- a/src/broadcom/compiler/nir_to_vir.c -+++ b/src/broadcom/compiler/nir_to_vir.c -@@ -656,6 +656,8 @@ ntq_emit_tmu_general(struct v3d_compile *c, nir_intrinsic_instr *instr, - */ - uint32_t perquad = - is_load && !vir_in_nonuniform_control_flow(c) && -+ c->s->info.stage == MESA_SHADER_FRAGMENT && -+ c->s->info.fs.needs_quad_helper_invocations && - !c->emitted_discard ? - GENERAL_TMU_LOOKUP_PER_QUAD : - GENERAL_TMU_LOOKUP_PER_PIXEL; --- -2.44.0 - diff --git a/spec_files/mesa/mesa-28923.patch b/spec_files/mesa/mesa-28923.patch deleted file mode 100644 index 315b045e..00000000 --- a/spec_files/mesa/mesa-28923.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8561958ccfd9b3a742a8742cc5931e9a6f6a7814 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= -Date: Thu, 25 Apr 2024 11:47:31 +0200 -Subject: [PATCH] meson: Disable proc_macro2 unestable features -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -proc-macro2 >= 1.0.80 uses proc_macro_byte_character [1] and -proc_macro_c_str_literals [2]. -Disable them until they are available. - -[1] https://github.com/rust-lang/rust/issues/115268 -[2] https://github.com/rust-lang/rust/issues/119750 -Signed-off-by: José Expósito ---- - subprojects/packagefiles/proc-macro2/meson.build | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/subprojects/packagefiles/proc-macro2/meson.build b/subprojects/packagefiles/proc-macro2/meson.build -index b39d76e80c825..5bd635c80a389 100644 ---- a/subprojects/packagefiles/proc-macro2/meson.build -+++ b/subprojects/packagefiles/proc-macro2/meson.build -@@ -41,6 +41,12 @@ endif - if rc.version().version_compare('< 1.57') - rust_args += ['--cfg', 'no_is_available'] - endif -+if rc.version().version_compare('< 1.79') -+ rust_args += [ -+ '--cfg', 'no_literal_byte_character', -+ '--cfg', 'no_literal_c_string', -+ ] -+endif - - u_ind = subproject('unicode-ident').get_variable('lib') - --- -GitLab - diff --git a/spec_files/mesa/mesa.spec b/spec_files/mesa/mesa.spec index 855e87ea..3bfa031b 100644 --- a/spec_files/mesa/mesa.spec +++ b/spec_files/mesa/mesa.spec @@ -62,7 +62,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 24.0.7 +%global ver 24.0.8 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 100.bazzite.{{{ git_dir_version }}} License: MIT AND BSD-3-Clause AND SGI-B-2.0 @@ -75,10 +75,6 @@ Source0: https://archive.mesa3d.org/mesa-%{ver}.tar.xz Source1: Mesa-MLAA-License-Clarification-Email.txt Patch10: gnome-shell-glthread-disable.patch -# Backport of https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28740 -# to fix rendering issues using GTK's GSK_RENDERER=ngl on Raspberry Pi: -# https://bugzilla.redhat.com/show_bug.cgi?id=2269412 -Patch11: 0001-broadcom-compiler-needs_quad_helper_invocation-enabl.patch # https://gitlab.com/evlaV/mesa/ Patch21: valve.patch