Skip to content

Commit 2176102

Browse files
committed
Merge remote-tracking branch 'upstream/25.3' into devsh-25.3
2 parents 7ea6463 + 7f1ccad commit 2176102

62 files changed

Lines changed: 7107 additions & 193 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.pick_status.json

Lines changed: 6461 additions & 1 deletion
Large diffs are not rendered by default.

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
25.3.5
1+
25.3.6

bin/gen_release_notes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,5 +385,5 @@ async def main() -> None:
385385

386386

387387
if __name__ == "__main__":
388-
loop = asyncio.get_event_loop()
388+
loop = asyncio.new_event_loop()
389389
loop.run_until_complete(main())

bin/pick/core.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class CommitDict(typing_extensions.TypedDict):
5252
IS_CC = re.compile(r'^\s*cc:\s*["\']?([0-9]{2}\.[0-9])?["\']?\s*["\']?([0-9]{2}\.[0-9])?["\']?\s*\<?mesa-stable',
5353
flags=re.MULTILINE | re.IGNORECASE)
5454
IS_REVERT = re.compile(r'This reverts commit ([0-9a-f]{40})')
55-
IS_BACKPORT = re.compile(r'^\s*backport-to:\s*(\d{2}\.\d),?\s*(\d{2}\.\d)?',
55+
IS_BACKPORT = re.compile(r'^\s*backport-to:\s*(?:(\d{2}\.\d),?\s*(\d{2}\.\d)?|(\*))',
5656
flags=re.MULTILINE | re.IGNORECASE)
5757

5858
# XXX: hack
@@ -295,7 +295,7 @@ async def resolve_nomination(commit: 'Commit', version: str) -> 'Commit':
295295

296296
if backport_to := IS_BACKPORT.findall(commit_message):
297297
for match in backport_to:
298-
if any(Version(version) >= Version(backport_version)
298+
if any(backport_version == '*' or Version(version) >= Version(backport_version)
299299
for backport_version in match if backport_version != ''):
300300
commit.nominated = True
301301
commit.nomination_type = NominationType.BACKPORT

bin/pick/core_test.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ def test_single_release(self):
263263
""")
264264

265265
backport_to = core.IS_BACKPORT.findall(message)
266-
assert backport_to == [('19.2', '')]
266+
assert backport_to == [('19.2', '', '')]
267267

268268
def test_multiple_release_space(self):
269269
"""Tests commit with more than one branch specified"""
@@ -278,7 +278,7 @@ def test_multiple_release_space(self):
278278
""")
279279

280280
backport_to = core.IS_BACKPORT.findall(message)
281-
assert backport_to == [('19.1', '19.2')]
281+
assert backport_to == [('19.1', '19.2', '')]
282282

283283
def test_multiple_release_comma(self):
284284
"""Tests commit with more than one branch specified"""
@@ -293,7 +293,7 @@ def test_multiple_release_comma(self):
293293
""")
294294

295295
backport_to = core.IS_BACKPORT.findall(message)
296-
assert backport_to == [('19.1', '19.2')]
296+
assert backport_to == [('19.1', '19.2', '')]
297297

298298
def test_multiple_release_lines(self):
299299
"""Tests commit with more than one branch specified in mulitple tags"""
@@ -305,7 +305,7 @@ def test_multiple_release_lines(self):
305305
""")
306306

307307
backport_to = core.IS_BACKPORT.findall(message)
308-
assert backport_to == [('19.0', ''), ('19.1', '19.2')]
308+
assert backport_to == [('19.0', '', ''), ('19.1', '19.2', '')]
309309

310310

311311
class TestResolveNomination:
@@ -405,6 +405,17 @@ async def test_backport_is_nominated(self):
405405
assert c.nominated
406406
assert c.nomination_type is core.NominationType.BACKPORT
407407

408+
@pytest.mark.asyncio
409+
async def test_backport_all_is_nominated(self):
410+
s = self.FakeSubprocess(b'Backport-to: *')
411+
c = core.Commit('abcdef1234567890', 'a commit')
412+
413+
with mock.patch('bin.pick.core.asyncio.create_subprocess_exec', s.mock):
414+
await core.resolve_nomination(c, '0.0')
415+
416+
assert c.nominated
417+
assert c.nomination_type is core.NominationType.BACKPORT
418+
408419
@pytest.mark.asyncio
409420
async def test_backport_is_nominated_after(self):
410421
s = self.FakeSubprocess(b'Backport-to: 16.2')

docs/relnotes.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Release Notes
33

44
The release notes summarize what's new or changed in each Mesa release.
55

6+
- :doc:`25.3.6 release notes <relnotes/25.3.6>`
67
- :doc:`25.3.5 release notes <relnotes/25.3.5>`
78
- :doc:`25.3.4 release notes <relnotes/25.3.4>`
89
- :doc:`25.3.3 release notes <relnotes/25.3.3>`
@@ -472,6 +473,7 @@ The release notes summarize what's new or changed in each Mesa release.
472473
:maxdepth: 1
473474
:hidden:
474475

476+
25.3.6 <relnotes/25.3.6>
475477
25.3.5 <relnotes/25.3.5>
476478
25.3.4 <relnotes/25.3.4>
477479
25.3.3 <relnotes/25.3.3>

docs/relnotes/25.3.6.rst

Lines changed: 207 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,207 @@
1+
Mesa 25.3.6 Release Notes / 2026-02-19
2+
======================================
3+
4+
Mesa 25.3.6 is a bug fix release which fixes bugs found since the 25.3.5 release.
5+
6+
Mesa 25.3.6 implements the OpenGL 4.6 API, but the version reported by
7+
glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
8+
glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
9+
Some drivers don't support all the features required in OpenGL 4.6. OpenGL
10+
4.6 is **only** available if requested at context creation.
11+
Compatibility contexts may report a lower version depending on each driver.
12+
13+
Mesa 25.3.6 implements the Vulkan 1.4 API, but the version reported by
14+
the apiVersion property of the VkPhysicalDeviceProperties struct
15+
depends on the particular driver being used.
16+
17+
SHA checksums
18+
-------------
19+
20+
::
21+
22+
SHA256: 59217efeac3b64e7ced958324b9db7494f1e0741aeb22d780276514cc1b8f206 mesa-25.3.6.tar.xz
23+
SHA512: 73620003e1e67c6b5ad076afb19e0b250214cfb6ed830166fb70058173ec3b19a2a8f5b5a78d8cce7a70745f5e4fa439913d15d8b38ca0002455b238f5865d38 mesa-25.3.6.tar.xz
24+
25+
26+
New features
27+
------------
28+
29+
- None
30+
31+
32+
Bug fixes
33+
---------
34+
35+
- [radeonsi] Regression: GL_FEEDBACK returns 0.0 for X-coordinates (Legacy GL)
36+
- venus crashes in vn_CreateDevice() with latest mesa/main [bisected]
37+
- Question: Does building Lavapipe on Windows require building "microsoft-experimental" as well?
38+
- [ANV][DG2][Regression]: Flickering water "boxes" in Civilization VII
39+
- mesa: deleting a buffer bound only to an index also undoes the associated general target binding
40+
- [ANV][PTL] R.E.P.O. GPU Hang
41+
42+
43+
Changes
44+
-------
45+
46+
Aitor Camacho (1):
47+
48+
- wsi/metal: Expose additional color spaces if instance extension enabled
49+
50+
Alyssa Rosenzweig (1):
51+
52+
- brw: drop buggy SLM optimization
53+
54+
Caio Oliveira (1):
55+
56+
- brw: Fix cooperative matrix constant sources other than src0
57+
58+
Calder Young (1):
59+
60+
- anv: Avoid dumping BVH before command buffer is submitted
61+
62+
Christian Gmeiner (1):
63+
64+
- pan/compiler: Fix progress reporting in pan_nir_lower_store_component
65+
66+
Daniel Schürmann (1):
67+
68+
- nir/clone: Fix cloning indirect call instructions
69+
70+
Dave Airlie (1):
71+
72+
- gallivm: handle u16 correct on const loads.
73+
74+
Dylan Baker (9):
75+
76+
- docs: Add 25.3.5 SHA sums
77+
- .pick_status.json: Update to efb5ab1e4ba12886a94bd321bbd1010e7c10e5b4
78+
- .pick_status.json: Update to a1a5dd7e2f2bb594420195b40d99a7b84e6ba6a5
79+
- .pick_status.json: Update to c7603a11deb55c2f9640725dbcdbf51ee6335bea
80+
- .pick_status.json: Update to 5d4f977573ac92ebbd756ff9108b0f24799dd1ff
81+
- .pick_status.json: Update to fc3951cfde692b682ae0a79502cd7ba3b77a68d7
82+
- .pick_status.json: Mark 7dd7731ac710b0c7213f6bb466b33f62eca80604 as denominated
83+
- .pick_status.json: Mark 1be4ffdff926597c82a6482b482e4f1d8e74f038 as denominated
84+
- .pick_status.json: Update to b05271f16c78010d32564ee307aad78dc7d58151
85+
86+
Eric Engestrom (2):
87+
88+
- bin/gen_release_notes: fix support for python 3.14
89+
- pick-ui: add \`Backport-to: *` as a synonym to \`Cc: mesa-stable`
90+
91+
Eric R. Smith (1):
92+
93+
- mesa: do not unbind general point when different indexed points are deleted
94+
95+
Faith Ekstrand (3):
96+
97+
- pan/bi: Run lower_alu_width after opt_algebraic_late
98+
- pan/bi: Don't attempt to fuse AND(ICMP, ICMP) if the AND is swizzled
99+
- util: Move STACK_ARRAY into util
100+
101+
Georg Lehmann (1):
102+
103+
- aco/lower_branches: consider jump target of conditional branches based on vcc
104+
105+
Iago Toral Quiroga (1):
106+
107+
- nir/opt_vectorize_load_store: allow sizes unaligned with high offset for loads
108+
109+
Ian Romanick (2):
110+
111+
- spirv: Use STACK_ARRAY instead of NIR_VLA
112+
- nir: Use STACK_ARRAY instead of NIR_VLA
113+
114+
Jesse Natalie (1):
115+
116+
- meson: Include DirectX-Headers dependency for all VK Windows builds
117+
118+
Jianxun Zhang (1):
119+
120+
- anv: Limit modifier disabling workaround to specific GTK versions
121+
122+
Juston Li (1):
123+
124+
- anv: set missing protected bit for protected depth/stencil surfaces
125+
126+
Karol Herbst (2):
127+
128+
- vtn/opencl: flush denorms for cbrt()
129+
- rusticl/mesa: only use resource_from_user_memory if the cap is advertised
130+
131+
Khem Raj (1):
132+
133+
- glx: fix const qualifier warnings found with C23 glibc support
134+
135+
Konstantin Seurer (2):
136+
137+
- radv: Fix setting the viewport for depth stencil FS resolves
138+
- vulkan/cmd_queue: Fixup stride for multi draws
139+
140+
Lars-Ivar Hesselberg Simonsen (1):
141+
142+
- pan/genxml/v13: Fix HSR Prepass typo
143+
144+
Lionel Landwerlin (4):
145+
146+
- anv: flush render caches on first pipeline select
147+
- anv: fix nested command buffer relocations
148+
- anv: add missing constant cache invalidation for descriptor buffers
149+
- isl: fix 32bit math with 4GB buffer size
150+
151+
Matt Turner (4):
152+
153+
- brw/cse: fix \`operands_match` corrupting non-IMM register data
154+
- brw/cse: use copies in \`operands_match` instead of in-place modification
155+
- elk/cse: fix \`operands_match` corrupting non-IMM register data
156+
- elk/cse: use copies in \`operands_match` instead of in-place modification
157+
158+
Mel Henning (1):
159+
160+
- zink: Emit float controls for preserve_denorms too
161+
162+
Pavel Ondračka (1):
163+
164+
- mesa: implement FRAMEBUFFER_RENDERABLE internalformat query
165+
166+
Reilly Brogan (1):
167+
168+
- amd,compiler: fix const errors found with C23 glibc support
169+
170+
Ryan Zhang (1):
171+
172+
- panvk: guard against NULL pointers to avoid crash
173+
174+
Samuel Pitoiset (3):
175+
176+
- radv/meta: fix the key for DCC decompress on compute
177+
- radv: fix late decompressions for fbfetch with more corner cases
178+
- radv/meta: fix CmdCopyBufferToImage2() on compute queue with compressed HTILE
179+
180+
Tapani Pälli (3):
181+
182+
- intel/genxml: add CHICKEN_RASTER_2 with required bit for Xe3
183+
- anv: set DisableAnyMCTRresponsefix to zero on init
184+
- iris: set DisableAnyMCTRresponsefix to zero on init
185+
186+
Timothy Arceri (2):
187+
188+
- mesa: add _mesa_lookup_state_param_idx() helper
189+
- st/glsl_to_nir: make sure the variant has the correct locations set
190+
191+
Vinson Lee (2):
192+
193+
- compiler/clc: Fix const correctness in libclc_add_generic_variants
194+
- freedreno/decode: Fix const correctness in get_tex_count
195+
196+
Wei Hao (1):
197+
198+
- radeonsi: fix threaded shader compilation finishing after context is destroyed
199+
200+
Yiwei Zhang (2):
201+
202+
- venus: remove obsolete asserts for ANB image creation
203+
- venus: workaround a gcc-15 dead store elimination (DSE) bug
204+
205+
Zan Dobersek (1):
206+
207+
- tu/kgsl: wait-only submit handling should not ignore sparse bind commands

docs/submittingpatches.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,9 @@ following example::
197197
This will backport the commit to the 21.0 branch, as well as any more recent
198198
stable branch. Multiple ``Backport-to:`` lines are allowed, but only the
199199
lowest number mentioned actually matters, so for clarity, please only use one.
200+
You can also use the special ``Backport-to: *`` which will nominate the commit
201+
to be backported to every active stable branch, making it a synonym to the ``Cc:
202+
mesa-stable`` below.
200203

201204
The last option is deprecated and mostly here for historical reasons
202205
dating back to when patch submission was done via emails: using a ``Cc:``

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ if with_dri
607607
endif
608608

609609
dep_dxheaders = null_dep
610-
if with_gallium_d3d12 or with_microsoft_clc or with_microsoft_vk or with_gfxstream_vk and host_machine.system() == 'windows'
610+
if with_gallium_d3d12 or with_microsoft_clc or with_microsoft_vk or (with_any_vk and host_machine.system() == 'windows')
611611
dep_dxheaders = dependency('directx-headers', required : false)
612612
if not dep_dxheaders.found()
613613
dep_dxheaders = dependency('DirectX-Headers',

src/amd/compiler/aco_lower_branches.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,9 @@ eliminate_useless_exec_writes_in_block(branch_ctx& ctx, Block& block)
298298

299299
/* blocks_incoming_exec_used is initialized to true, so this is correct even for loops. */
300300
if (instr->opcode == aco_opcode::s_cbranch_scc0 ||
301-
instr->opcode == aco_opcode::s_cbranch_scc1) {
301+
instr->opcode == aco_opcode::s_cbranch_scc1 ||
302+
instr->opcode == aco_opcode::s_cbranch_vccz ||
303+
instr->opcode == aco_opcode::s_cbranch_vccnz) {
302304
exec_write_used |= ctx.blocks_incoming_exec_used[instr->salu().imm];
303305
}
304306

0 commit comments

Comments
 (0)