Update to 24.2.3

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2313426
This commit is contained in:
José Expósito 2024-09-19 13:00:56 +02:00
parent d3d5fe7712
commit a70f713c73
3 changed files with 2 additions and 55 deletions

View file

@ -68,7 +68,7 @@
Name: mesa Name: mesa
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
%global ver 24.2.2 %global ver 24.2.3
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Release: %autorelease Release: %autorelease
License: MIT AND BSD-3-Clause AND SGI-B-2.0 License: MIT AND BSD-3-Clause AND SGI-B-2.0
@ -81,7 +81,6 @@ Source0: https://archive.mesa3d.org/mesa-%{ver}.tar.xz
Source1: Mesa-MLAA-License-Clarification-Email.txt Source1: Mesa-MLAA-License-Clarification-Email.txt
Patch10: gnome-shell-glthread-disable.patch Patch10: gnome-shell-glthread-disable.patch
Patch11: rhbz2270430.patch
BuildRequires: meson >= 1.3.0 BuildRequires: meson >= 1.3.0
BuildRequires: gcc BuildRequires: gcc
@ -684,7 +683,6 @@ popd
%if 0%{?with_va} %if 0%{?with_va}
%files va-drivers %files va-drivers
%{_libdir}/dri/libgallium_drv_video.so
%{_libdir}/dri/nouveau_drv_video.so %{_libdir}/dri/nouveau_drv_video.so
%if 0%{?with_r600} %if 0%{?with_r600}
%{_libdir}/dri/r600_drv_video.so %{_libdir}/dri/r600_drv_video.so
@ -698,7 +696,6 @@ popd
%if 0%{?with_vdpau} %if 0%{?with_vdpau}
%files vdpau-drivers %files vdpau-drivers
%dir %{_libdir}/vdpau %dir %{_libdir}/vdpau
%{_libdir}/vdpau/libvdpau_gallium.so.1*
%{_libdir}/vdpau/libvdpau_nouveau.so.1* %{_libdir}/vdpau/libvdpau_nouveau.so.1*
%if 0%{?with_r600} %if 0%{?with_r600}
%{_libdir}/vdpau/libvdpau_r600.so.1* %{_libdir}/vdpau/libvdpau_r600.so.1*

View file

@ -1,50 +0,0 @@
From 5fed6bee19be40782a2e3bc76648d3177b4e02d9 Mon Sep 17 00:00:00 2001
From: Jose Maria Casanova Crespo <jmcasanova@igalia.com>
Date: Wed, 28 Aug 2024 21:58:09 +0200
Subject: [PATCH] v3d: v3d_resource Use LINEAR layout for importing with
INVALID modifier
v3d_resource_from_handle when importing a DRM_FORMAT_MOD_INVALID
considered that if we had a render-only device the resource layout was
linear and if we didn't have render-only the resource layout was tiled.
This change honors the resource creation with the SCANOUT flag
independently of the availability of the render-only for the
DRM_FORMAT_MOD_INVALID modifier.
It also fixes most of the failing piglit text for:
spec@ext_image_dma_buf_import@ext_image_dma_buf_import.*
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11594
Cc: mesa-stable
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30946>
---
src/gallium/drivers/v3d/v3d_resource.c | 3 ++-
3 files changed, 2 insertions(+), 43 deletions(-)
diff --git a/src/gallium/drivers/v3d/v3d_resource.c b/src/gallium/drivers/v3d/v3d_resource.c
index 5f24c6740782c..d582164ad5360 100644
--- a/src/gallium/drivers/v3d/v3d_resource.c
+++ b/src/gallium/drivers/v3d/v3d_resource.c
@@ -842,6 +842,7 @@ v3d_resource_create_with_modifiers(struct pipe_screen *pscreen,
v3d_setup_slices(rsc, 0, tmpl->bind & PIPE_BIND_SHARED);
if (screen->ro && (tmpl->bind & PIPE_BIND_SCANOUT)) {
+ assert(!rsc->tiled);
struct winsys_handle handle;
struct pipe_resource scanout_tmpl = {
.target = prsc->target,
@@ -912,7 +913,7 @@ v3d_resource_from_handle(struct pipe_screen *pscreen,
rsc->tiled = true;
break;
case DRM_FORMAT_MOD_INVALID:
- rsc->tiled = screen->ro == NULL;
+ rsc->tiled = false;
break;
default:
switch(fourcc_mod_broadcom_mod(whandle->modifier)) {
--
GitLab

View file

@ -1 +1 @@
SHA512 (mesa-24.2.2.tar.xz) = d9979f7a1ae7bfeb0658d1b6c9021b7d0043c3ca71db9deaa2fc8a3d4c07cd58497b9233737a31fb66ef711a369a859757a63fb86c2aadd859867f9a4eaf16a9 SHA512 (mesa-24.2.3.tar.xz) = 7a1ace23568d1907b778a2859f97c8988a414ba74e02e1fb5af6f95f768e1b1a2dfdaf412b0d655678ed915d28273953fd1236ebcd87553a1880f1a7f3ea4d44