Bug#1107652: unblock: mesa/25.0.5-2
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: mesa@packages.debian.org
Control: affects -1 + src:mesa
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package mesa
[ Reason ]
The version has been in sid for 20+ days without issues.
[ Impact ]
Fixes: #1104029 etnaviv: please add support for texelfetch for Vivante GC7000
[ Tests ]
No tests, but no complaints either after it got in sid.
[ Risks ]
Low risk, though the fix consists of three upstream commits which have not
landed in any upstream stable release yet but will be in 25.2.0 next August.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
none
unblock mesa/25.0.5-2
debdiff:
diff -Nru mesa-25.0.5/debian/changelog mesa-25.0.5/debian/changelog
--- mesa-25.0.5/debian/changelog 2025-05-02 08:32:56.000000000 +0300
+++ mesa-25.0.5/debian/changelog 2025-05-19 13:49:49.000000000 +0300
@@ -1,3 +1,11 @@
+mesa (25.0.5-2) unstable; urgency=medium
+
+ [ Johannes Schauer Marin Rodrigues ]
+ * cherry-pick patch from upstream: etnaviv-add-support-for-texelfetch.patch
+ (Closes: #1104029)
+
+ -- Timo Aaltonen <tjaalton@debian.org> Mon, 19 May 2025 13:49:49 +0300
+
mesa (25.0.5-1) unstable; urgency=medium
[ Simon McVittie ]
diff -Nru mesa-25.0.5/debian/patches/etnaviv-add-support-for-texelfetch.patch mesa-25.0.5/debian/patches/etnaviv-add-support-for-texelfetch.patch
--- mesa-25.0.5/debian/patches/etnaviv-add-support-for-texelfetch.patch 1970-01-01 02:00:00.000000000 +0200
+++ mesa-25.0.5/debian/patches/etnaviv-add-support-for-texelfetch.patch 2025-05-19 13:49:42.000000000 +0300
@@ -0,0 +1,144 @@
+From da90fca6093dd58cc351b0ac624ea8c0d83a81f9 Mon Sep 17 00:00:00 2001
+From: Christian Gmeiner <cgmeiner@igalia.com>
+Date: Fri, 18 Apr 2025 23:35:20 +0200
+Subject: [PATCH 1/3] etnaviv: isa: Add txf instruction
+
+This instruction is used to implement texelfetch.
+
+Blob generates such txf's for
+dEQP-GLES3.functional.shaders.texture_functions.texelfetch.+
+
+Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34685>
+---
+ src/etnaviv/isa/etnaviv.xml | 5 +++++
+ src/etnaviv/isa/tests/disasm.cpp | 1 +
+ 2 files changed, 6 insertions(+)
+
+diff --git a/src/etnaviv/isa/etnaviv.xml b/src/etnaviv/isa/etnaviv.xml
+index a337c1e9d0762..42f551238bf1b 100644
+--- a/src/etnaviv/isa/etnaviv.xml
++++ b/src/etnaviv/isa/etnaviv.xml
+@@ -1359,6 +1359,11 @@ SPDX-License-Identifier: MIT
+ <pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
+ </bitset>
+
++<bitset name="txf" extends="#instruction-tex-src0-src1-src2">
++ <pattern low="0" high="5">001001</pattern> <!-- OPC -->
++ <pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
++</bitset>
++
+ <bitset name="imadlo0" extends="#instruction-alu-src0-src1-src2">
+ <pattern low="0" high="5">001100</pattern> <!-- OPC -->
+ <pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
+diff --git a/src/etnaviv/isa/tests/disasm.cpp b/src/etnaviv/isa/tests/disasm.cpp
+index aa027618aa40a..3d4ebec8a49be 100644
+--- a/src/etnaviv/isa/tests/disasm.cpp
++++ b/src/etnaviv/isa/tests/disasm.cpp
+@@ -166,6 +166,7 @@ INSTANTIATE_TEST_SUITE_P(Opcodes, DisasmTest,
+ disasm_state{ {0x00801036, 0x15400804, 0x01540050, 0x00000002}, "clamp0_max t0.x___, u0.yyyy, u0.zzz
z, void\n"},
+ disasm_state{ {0x0080103b, 0x00001804, 0x40000000, 0x00400028}, "iaddsat.s32 t0.x___, t1.xxxx, void, -t2.xxxx\n"},
+ disasm_state{ {0x01001008, 0x15400804, 0xd00100c0, 0x00000007}, "imod.u16 t0._y__, t0.yyyy, 1, void\n"},
++ disasm_state{ {0x07811009, 0x15001f20, 0x01ff00c0, 0x78021008}, "txf t1, tex0.xyzw, t1.xyyy, t1.wwww, 4352\n", FLAG_FAILING_ASM},
+ disasm_state{ {0x0080103c, 0x00001804, 0x40000140, 0x00000000}, "imullo0.s32 t0.x___, t1.xxxx, t2.xxxx, void\n"},
+ disasm_state{ {0x00801000, 0x00001804, 0x40010140, 0x00000000}, "imulhi0.s32 t0.x___, t1.xxxx, t2.xxxx, void\n"},
+ disasm_state{ {0x00801004, 0x00201804, 0x40010040, 0x00000000}, "idiv0.s16 t0.x___, t1.xxxx, t0.xxxx, void\n"},
+--
+GitLab
+
+
+From eefe486533eb58d3d1e81daa5abd16e63ee4c7a9 Mon Sep 17 00:00:00 2001
+From: Christian Gmeiner <cgmeiner@igalia.com>
+Date: Fri, 18 Apr 2025 23:37:19 +0200
+Subject: [PATCH 2/3] etnaviv: nir: Legalize txf lod src
+
+The LOD must be a float, unlike the GLSL function, which expects an integer.
+
+Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
+Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34685>
+---
+ .../etnaviv/etnaviv_nir_lower_texture.c | 25 +++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+diff --git a/src/gallium/drivers/etnaviv/etnaviv_nir_lower_texture.c b/src/gallium/drivers/etnaviv/etnaviv_nir_lower_texture.c
+index d0462ead016dc..d20d175da79a8 100644
+--- a/src/gallium/drivers/etnaviv/etnaviv_nir_lower_texture.c
++++ b/src/gallium/drivers/etnaviv/etnaviv_nir_lower_texture.c
+@@ -26,6 +26,28 @@ lower_txs(nir_builder *b, nir_instr *instr, UNUSED void *data)
+ return true;
+ }
+
++static bool
++legalize_txf_lod(nir_builder *b, nir_instr *instr, UNUSED void *data)
++{
++ if (instr->type != nir_instr_type_tex)
++ return false;
++
++ nir_tex_instr *tex = nir_instr_as_tex(instr);
++
++ if (tex->op != nir_texop_txf)
++ return false;
++
++ b->cursor = nir_before_instr(instr);
++
++ int lod_index = nir_tex_instr_src_index(tex, nir_tex_src_lod);
++ assert(lod_index >= 0);
++ nir_def *lod = tex->src[lod_index].src.ssa;
++
++ nir_src_rewrite(&tex->src[lod_index].src, nir_i2f32(b, lod));
++
++ return true;
++}
++
+ bool
+ etna_nir_lower_texture(nir_shader *s, struct etna_shader_key *key)
+ {
+@@ -48,5 +70,8 @@ etna_nir_lower_texture(nir_shader *s, struct etna_shader_key *key)
+ NIR_PASS(progress, s, nir_shader_instructions_pass, lower_txs,
+ nir_metadata_control_flow, NULL);
+
++ NIR_PASS(progress, s, nir_shader_instructions_pass, legalize_txf_lod,
++ nir_metadata_control_flow, NULL);
++
+ return progress;
+ }
+--
+GitLab
+
+
+From 614b66529de2832575cdb0c97581d0d5f791ed72 Mon Sep 17 00:00:00 2001
+From: Christian Gmeiner <cgmeiner@igalia.com>
+Date: Fri, 18 Apr 2025 23:42:14 +0200
+Subject: [PATCH 3/3] etnaviv: nir: Add support for txf texture operation
+
+The src[2] value 0x1100 is set based on observed behavior of the blob driver,
+though its exact meaning remains to be documented.
+
+Passes all dEQP-GLES3.functional.shaders.texture_functions.texelfetch.*
+tests on GC7000.
+
+Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34685>
+---
+ src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.c
+index 08a5ab5fb7bc3..708f0788b580d 100644
+--- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.c
++++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.c
+@@ -212,6 +212,10 @@ etna_emit_tex(struct etna_compile *c, nir_texop op, unsigned texid, unsigned dst
+ case nir_texop_txb: inst.opcode = ISA_OPC_TEXLDB; break;
+ case nir_texop_txd: inst.opcode = ISA_OPC_TEXLDD; break;
+ case nir_texop_txl: inst.opcode = ISA_OPC_TEXLDL; break;
++ case nir_texop_txf:
++ inst.opcode = ISA_OPC_TXF;
++ inst.src[2] = etna_immediate_int(0x1100);
++ break;
+ default:
+ compile_error(c, "Unhandled NIR tex type: %d\n", op);
+ }
+--
+GitLab
+
diff -Nru mesa-25.0.5/debian/patches/series mesa-25.0.5/debian/patches/series
--- mesa-25.0.5/debian/patches/series 2025-05-02 08:23:09.000000000 +0300
+++ mesa-25.0.5/debian/patches/series 2025-05-19 13:49:42.000000000 +0300
@@ -2,3 +2,4 @@
src_glx_dri_common.h.diff
disable_ppc64el_assembly.diff
drisw-Avoid-crashing-when-swrast_loader-NULL.patch
+etnaviv-add-support-for-texelfetch.patch
Reply to: