public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/mesa] f44: Merge branch 'rawhide' into f44
@ 2026-06-18 10:16
0 siblings, 0 replies; only message in thread
From: @ 2026-06-18 10:16 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/mesa
Branch : f44
Commit : 3157cb5404cf8d147a97ad1883cfa917fe3df8cb
Author : José Expósito <jexposit@redhat.com>
Date : 2026-06-18T12:16:27+02:00
Stats : +10/-108 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/mesa/c/3157cb5404cf8d147a97ad1883cfa917fe3df8cb?branch=f44
Log:
Merge branch 'rawhide' into f44
---
diff --git a/.packit.yaml b/.packit.yaml
index e9d1637..9889edb 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -3,7 +3,7 @@ upstream_tag_template: mesa-{version}
jobs:
- job: pull_from_upstream
- upstream_tag_include: "^mesa-26\\.0\\..*$"
+ upstream_tag_include: "^mesa-26\\.1\\..*$"
trigger: release
dist_git_branches:
- rawhide
diff --git a/39951.patch b/39951.patch
deleted file mode 100644
index 7fdc336..0000000
--- a/39951.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 3b3485efa6c5ad38a21819f111bee052be05acb0 Mon Sep 17 00:00:00 2001
-From: Ryan Houdek <Sonicadvance1@gmail.com>
-Date: Tue, 17 Feb 2026 14:52:50 -0800
-Subject: [PATCH] freedreno/fdl: Fix compiling with GCC and AVX2
-
-Clang is more lenient around casting same size vectors between the
-different AVX types, GCC on the other hand is not. Add appropriate
-casting between the different register typings to make GCC happy.
-
-No functional change.
-
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/14876
-Fixes: b554e4c727c90b88a542b86989f6664537658f85
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39951>
----
- src/freedreno/fdl/fd6_tiled_memcpy.cc | 40 +++++++++++++--------------
- 1 file changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/src/freedreno/fdl/fd6_tiled_memcpy.cc b/src/freedreno/fdl/fd6_tiled_memcpy.cc
-index 7bde850b4049..470db29aa938 100644
---- a/src/freedreno/fdl/fd6_tiled_memcpy.cc
-+++ b/src/freedreno/fdl/fd6_tiled_memcpy.cc
-@@ -459,10 +459,10 @@ linear_to_tiled_1cpp(char *_tiled, char *_linear, uint32_t linear_pitch)
- auto linear2 = _mm256_loadu_ps((float const*)(_linear + 2 * linear_pitch));
- auto linear3 = _mm256_loadu_ps((float const*)(_linear + 3 * linear_pitch));
-
-- auto linear_0_1_low = _mm256_unpacklo_epi16(linear0, linear1);
-- auto linear_2_3_low = _mm256_unpacklo_epi16(linear2, linear3);
-- auto linear_0_1_high = _mm256_unpackhi_epi16(linear0, linear1);
-- auto linear_2_3_high = _mm256_unpackhi_epi16(linear2, linear3);
-+ auto linear_0_1_low = _mm256_unpacklo_epi16(_mm256_castps_si256(linear0), _mm256_castps_si256(linear1));
-+ auto linear_2_3_low = _mm256_unpacklo_epi16(_mm256_castps_si256(linear2), _mm256_castps_si256(linear3));
-+ auto linear_0_1_high = _mm256_unpackhi_epi16(_mm256_castps_si256(linear0), _mm256_castps_si256(linear1));
-+ auto linear_2_3_high = _mm256_unpackhi_epi16(_mm256_castps_si256(linear2), _mm256_castps_si256(linear3));
-
- // Effectively 256-bit zip1 ARM equivalent
- auto r1_zip1 = _mm256_permute4x64_epi64(linear_2_3_low, 0x60);
-@@ -482,10 +482,10 @@ linear_to_tiled_1cpp(char *_tiled, char *_linear, uint32_t linear_pitch)
- auto r4_zip2 = _mm256_permute4x64_epi64(linear_0_1_high, 0xf6);
- auto r4 = _mm256_blend_epi32(r4_zip2, r4_zip1, 0xcc);
-
-- _mm256_storeu_ps((float*)tiled, r1); tiled++;
-- _mm256_storeu_ps((float*)tiled, r2); tiled++;
-- _mm256_storeu_ps((float*)tiled, r3); tiled++;
-- _mm256_storeu_ps((float*)tiled, r4); tiled++;
-+ _mm256_storeu_ps((float*)tiled, _mm256_castsi256_ps(r1)); tiled++;
-+ _mm256_storeu_ps((float*)tiled, _mm256_castsi256_ps(r2)); tiled++;
-+ _mm256_storeu_ps((float*)tiled, _mm256_castsi256_ps(r3)); tiled++;
-+ _mm256_storeu_ps((float*)tiled, _mm256_castsi256_ps(r4)); tiled++;
- }
- #else
- memcpy_small<1, LINEAR_TO_TILED, FDL_MACROTILE_4_CHANNEL>(
-@@ -571,20 +571,20 @@ linear_to_tiled_2cpp(char *_tiled, char *_linear, uint32_t linear_pitch)
- auto linear2 = _mm256_loadu_ps((float const*)(_linear + 2 * linear_pitch));
- auto linear3 = _mm256_loadu_ps((float const*)(_linear + 3 * linear_pitch));
-
-- auto linear_0_1_low = _mm256_unpacklo_epi32(linear0, linear1);
-- auto linear_2_3_low = _mm256_unpacklo_epi32(linear2, linear3);
-- auto linear_0_1_high = _mm256_unpackhi_epi32(linear0, linear1);
-- auto linear_2_3_high = _mm256_unpackhi_epi32(linear2, linear3);
-+ auto linear_0_1_low = _mm256_unpacklo_epi32(_mm256_castps_si256(linear0), _mm256_castps_si256(linear1));
-+ auto linear_2_3_low = _mm256_unpacklo_epi32(_mm256_castps_si256(linear2), _mm256_castps_si256(linear3));
-+ auto linear_0_1_high = _mm256_unpackhi_epi32(_mm256_castps_si256(linear0), _mm256_castps_si256(linear1));
-+ auto linear_2_3_high = _mm256_unpackhi_epi32(_mm256_castps_si256(linear2), _mm256_castps_si256(linear3));
-
- auto r1 = _mm256_inserti128_si256(linear_0_1_low, _mm256_castsi256_si128(linear_2_3_low), 1);
- auto r2 = _mm256_inserti128_si256(linear_0_1_high, _mm256_castsi256_si128(linear_2_3_high), 1);
- auto r3 = _mm256_permute2f128_si256(linear_0_1_low, linear_2_3_low, 0x31);
- auto r4 = _mm256_permute2f128_si256(linear_0_1_high, linear_2_3_high, 0x31);
-
-- _mm256_storeu_ps((float*)tiled, r1); tiled++;
-- _mm256_storeu_ps((float*)tiled, r2); tiled++;
-- _mm256_storeu_ps((float*)tiled, r3); tiled++;
-- _mm256_storeu_ps((float*)tiled, r4); tiled++;
-+ _mm256_storeu_ps((float*)tiled, _mm256_castsi256_ps(r1)); tiled++;
-+ _mm256_storeu_ps((float*)tiled, _mm256_castsi256_ps(r2)); tiled++;
-+ _mm256_storeu_ps((float*)tiled, _mm256_castsi256_ps(r3)); tiled++;
-+ _mm256_storeu_ps((float*)tiled, _mm256_castsi256_ps(r4)); tiled++;
- }
- #else
- memcpy_small<2, LINEAR_TO_TILED, FDL_MACROTILE_4_CHANNEL>(
-@@ -670,10 +670,10 @@ linear_to_tiled_4cpp(char *_tiled, char *_linear, uint32_t linear_pitch)
- auto linear2 = _mm256_loadu_ps((float const*)(_linear + 2 * linear_pitch));
- auto linear3 = _mm256_loadu_ps((float const*)(_linear + 3 * linear_pitch));
-
-- auto r1 = _mm256_blend_ps(_mm256_permute4x64_pd(linear0, 0xd4), _mm256_permute4x64_pd(linear1, 0x60), 0xcc);
-- auto r2 = _mm256_blend_ps(_mm256_permute4x64_pd(linear2, 0xd4), _mm256_permute4x64_pd(linear3, 0x60), 0xcc);
-- auto r3 = _mm256_blend_ps(_mm256_permute4x64_pd(linear0, 0xf6), _mm256_permute4x64_pd(linear1, 0xe8), 0xcc);
-- auto r4 = _mm256_blend_ps(_mm256_permute4x64_pd(linear2, 0xf6), _mm256_permute4x64_pd(linear3, 0xe8), 0xcc);
-+ auto r1 = _mm256_blend_ps(_mm256_castpd_ps(_mm256_permute4x64_pd(_mm256_castps_pd(linear0), 0xd4)), _mm256_castpd_ps(_mm256_permute4x64_pd(_mm256_castps_pd(linear1), 0x60)), 0xcc);
-+ auto r2 = _mm256_blend_ps(_mm256_castpd_ps(_mm256_permute4x64_pd(_mm256_castps_pd(linear2), 0xd4)), _mm256_castpd_ps(_mm256_permute4x64_pd(_mm256_castps_pd(linear3), 0x60)), 0xcc);
-+ auto r3 = _mm256_blend_ps(_mm256_castpd_ps(_mm256_permute4x64_pd(_mm256_castps_pd(linear0), 0xf6)), _mm256_castpd_ps(_mm256_permute4x64_pd(_mm256_castps_pd(linear1), 0xe8)), 0xcc);
-+ auto r4 = _mm256_blend_ps(_mm256_castpd_ps(_mm256_permute4x64_pd(_mm256_castps_pd(linear2), 0xf6)), _mm256_castpd_ps(_mm256_permute4x64_pd(_mm256_castps_pd(linear3), 0xe8)), 0xcc);
-
- _mm256_storeu_ps((float*)tiled, r1); tiled++;
- _mm256_storeu_ps((float*)tiled, r2); tiled++;
---
-GitLab
-
diff --git a/mesa.spec b/mesa.spec
index d864a77..bfe261d 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -80,7 +80,7 @@
Name: mesa
Summary: Mesa graphics libraries
-Version: 26.0.8
+Version: 26.1.2
Release: %autorelease
License: MIT AND BSD-3-Clause AND SGI-B-2.0
URL: https://mesa3d.org
@@ -113,10 +113,6 @@ Source13: https://crates.io/api/v1/crates/syn/%{rust_syn_ver}/download#/sy
Source14: https://crates.io/api/v1/crates/unicode-ident/%{rust_unicode_ident_ver}/download#/unicode-ident-%{rust_unicode_ident_ver}.tar.gz
Source15: https://crates.io/api/v1/crates/rustc-hash/%{rustc_hash_ver}/download#/rustc-hash-%{rustc_hash_ver}.tar.gz
-# Backport of https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39951
-# which fixes compile-time conditional on AVX2 which is not built on Fedora
-Patch21: 39951.patch
-
BuildRequires: meson >= 1.3.0
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -129,7 +125,7 @@ BuildRequires: systemd-devel
# We only check for the minimum version of pkgconfig(libdrm) needed so that the
# SRPMs for each arch still have the same build dependencies. See:
# https://bugzilla.redhat.com/show_bug.cgi?id=1859515
-BuildRequires: pkgconfig(libdrm) >= 2.4.122
+BuildRequires: pkgconfig(libdrm) >= 2.4.133
%if 0%{?with_libunwind}
BuildRequires: pkgconfig(libunwind)
%endif
@@ -190,6 +186,9 @@ BuildRequires: rust-toolset
BuildRequires: cargo-rpm-macros
%endif
%endif
+%if 0%{?with_opencl}
+BuildRequires: libstdc++-static
+%endif
%if 0%{?with_nvk}
BuildRequires: cbindgen
%endif
@@ -206,7 +205,7 @@ BuildRequires: glslang
BuildRequires: pkgconfig(vulkan)
%endif
%if 0%{?with_d3d12}
-BuildRequires: pkgconfig(DirectX-Headers) >= 1.618.1
+BuildRequires: pkgconfig(DirectX-Headers) >= 1.619.1
%endif
%description
diff --git a/sources b/sources
index 58d35f8..8841ebf 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (mesa-26.0.8.tar.xz) = 3a43648a86c1bc48161a1669733b6c6a9294bf27ffb529f2ce078c2daa3b90b8c53b9cc06312197fb3a0830303d0b326d7535fb15849e6c26fad58009f3a6112
+SHA512 (mesa-26.1.2.tar.xz) = 08e7b6357c27bf6e13f59e6fb0f84b73ec25c2d1a01cd09ffcc35ab263f278f10f3bd36fde419f60e78e781abcb315a432d0d5ceb3bab0bca26b8a2a39758e03
SHA512 (paste-1.0.15.tar.gz) = 5026d3ec7141ec4e2517a0b1283912d0801e9356f77b703d954b379439b8d85e3886d42fb28f7835edaeeac465582da14233564fb010c71425a59c9e1cbd46b4
SHA512 (proc-macro2-1.0.106.tar.gz) = b726e2c92af434bfa88cd4f53c3fe6db647503567675fb439890dee3d15f5111137e3242b28d164114ce081c10acf3fd11950753ddb349190c87ee04e7d97744
SHA512 (quote-1.0.44.tar.gz) = 6c1e9b31e0c8bd13cd865e6846dc243d88f2c057adeb8e674117bdcb46947219a6a352a6a50be1132c483f55331e6556275ac514513dbf017825c64e5d96010d
diff --git a/.packit.yaml b/.packit.yaml
index a96c105..9889edb 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -13,6 +13,7 @@ jobs:
upstream_tag_include: "^mesa-25\\.3\\..*$"
trigger: release
dist_git_branches:
+ - f44
- f43
- job: koji_build
diff --git a/mesa.spec b/mesa.spec
index 3492e74..bfe261d 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -116,6 +116,7 @@ Source15: https://crates.io/api/v1/crates/rustc-hash/%{rustc_hash_ver}/dow
BuildRequires: meson >= 1.3.0
BuildRequires: gcc
BuildRequires: gcc-c++
+BuildRequires: libstdc++-static
BuildRequires: gettext
%if 0%{?with_hardware}
BuildRequires: kernel-headers
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-18 10:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-18 10:16 [rpms/mesa] f44: Merge branch 'rawhide' into f44
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox