From c3581b49102c033aa37635bacf500248eb83be6a Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 20 May 2024 16:57:01 -0700 Subject: [PATCH] chore: Remove unneeded patch --- ...r-needs_quad_helper_invocation-enabl.patch | 41 ------------------- spec_files/mesa/mesa.spec | 8 ++-- 2 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 spec_files/mesa/0001-broadcom-compiler-needs_quad_helper_invocation-enabl.patch 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.spec b/spec_files/mesa/mesa.spec index 855e87ea..43780730 100644 --- a/spec_files/mesa/mesa.spec +++ b/spec_files/mesa/mesa.spec @@ -75,10 +75,10 @@ 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 +# Work around for the meson bug until an upstream fix lands +# https://bugzilla.redhat.com/show_bug.cgi?id=2277018 +# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28923 +Patch11: mesa-28923.patch # https://gitlab.com/evlaV/mesa/ Patch21: valve.patch