Update to mesa 22.3.0-rc4 + disable glthread for gnome-shell

Resolves: rhbz#2117184
This commit is contained in:
Dave Airlie 2022-11-25 10:41:03 +10:00
parent 44fd4cd008
commit 6ee28d34b5
4 changed files with 17 additions and 44 deletions

View File

@ -1,41 +0,0 @@
From d871958702ebcd46213cd09b91b9b05685f9be62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Thu, 17 Nov 2022 08:31:33 -0500
Subject: [PATCH] st/mesa: suppress async glthread flushing for
GLX_EXT_texture_from_pixmap
This might fix some window system issues.
Fixes: 3da170faaec - glthread: change when glFlush flushes asynchronously
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19809>
---
src/mesa/state_tracker/st_manager.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c
index 0e8644f2b8d..575b72937c7 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -832,6 +832,9 @@ st_context_flush(struct st_context_iface *stctxi, unsigned flags,
st->gfx_shaders_may_be_dirty = true;
}
+/* This is only for GLX_EXT_texture_from_pixmap and equivalent features
+ * in EGL and WGL.
+ */
static bool
st_context_teximage(struct st_context_iface *stctxi,
enum st_texture_type tex_type,
@@ -915,6 +918,7 @@ st_context_teximage(struct st_context_iface *stctxi,
texObj->needs_validation = true;
_mesa_dirty_texobj(ctx, texObj);
+ ctx->Shared->HasExternallySharedImages = true;
_mesa_unlock_texture(ctx, texObj);
return true;
--
2.38.1

View File

@ -0,0 +1,11 @@
diff -up mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf
--- mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma 2022-11-25 10:32:32.175879868 +1000
+++ mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf 2022-11-25 10:32:43.743067470 +1000
@@ -653,6 +653,7 @@ TODO: document the other workarounds.
<application name="gnome-shell" executable="gnome-shell">
<option name="adaptive_sync" value="false" />
<option name="v3d_nonmsaa_texture_size_limit" value="true" />
+ <option name="mesa_glthread" value="false"/>
</application>
<application name="Desktop — Plasma" executable="plasmashell">
<option name="adaptive_sync" value="false" />

View File

@ -52,7 +52,7 @@
Name: mesa Name: mesa
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
%global ver 22.3.0-rc3 %global ver 22.3.0-rc4
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Release: 1%{?dist} Release: 1%{?dist}
License: MIT License: MIT
@ -64,7 +64,7 @@ Source0: https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz
# Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
Source1: Mesa-MLAA-License-Clarification-Email.txt Source1: Mesa-MLAA-License-Clarification-Email.txt
Patch10: 0001-st-mesa-suppress-async-glthread-flushing-for-GLX_EXT.patch Patch10: gnome-shell-glthread-disable.patch
BuildRequires: meson >= 0.45 BuildRequires: meson >= 0.45
BuildRequires: gcc BuildRequires: gcc
@ -601,6 +601,9 @@ popd
%endif %endif
%changelog %changelog
* Fri Nov 25 2022 Dave Airlie <airlied@redhat.com> - 22.3.0~rc4.1
- Update to mesa 22.3.0-rc4 + disable glthread for gnome-shell
* Wed Nov 23 2022 Dave Airlie <airlied@redhat.com> - 22.3.0~rc3.1 * Wed Nov 23 2022 Dave Airlie <airlied@redhat.com> - 22.3.0~rc3.1
- Update to mesa 22.3.0-rc3 - Update to mesa 22.3.0-rc3

View File

@ -1 +1 @@
SHA512 (mesa-22.3.0-rc3.tar.xz) = 4f67a3343b82ccf2ba0ed085199da4ae69cd9c144c998ca2730eb133fe78d9ad86fe967138a58bdeba8e387876d1aac4e37494faadb4dc77ce7f44704cb39e6b SHA512 (mesa-22.3.0-rc4.tar.xz) = b07c8c3adbd3e8878e4849954ed8b2344d2827da85ccc2dbaa2a26e154193fb736cd1773838957ee597158c8678603ac76b3bf94ec15f8280a1fd65c5f7a67e3