From ead9c38eee82d06fe08934773a671a9c32117d77 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 24 Nov 2022 15:09:44 +0000 Subject: [PATCH] Update to 22.3.0-rc4 --- ...-async-glthread-flushing-for-GLX_EXT.patch | 41 ------------------- mesa.spec | 5 +-- sources | 2 +- 3 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 0001-st-mesa-suppress-async-glthread-flushing-for-GLX_EXT.patch diff --git a/0001-st-mesa-suppress-async-glthread-flushing-for-GLX_EXT.patch b/0001-st-mesa-suppress-async-glthread-flushing-for-GLX_EXT.patch deleted file mode 100644 index af02b2c..0000000 --- a/0001-st-mesa-suppress-async-glthread-flushing-for-GLX_EXT.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d871958702ebcd46213cd09b91b9b05685f9be62 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= -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 -Part-of: ---- - 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 - diff --git a/mesa.spec b/mesa.spec index f54d4ad..afef03a 100644 --- a/mesa.spec +++ b/mesa.spec @@ -53,7 +53,7 @@ Name: mesa 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)} Release: %autorelease License: MIT @@ -65,9 +65,6 @@ Source0: https://archive.mesa3d.org/mesa-%{ver}.tar.xz # 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 -# fix some radeonsi issues -Patch0: 0001-st-mesa-suppress-async-glthread-flushing-for-GLX_EXT.patch - BuildRequires: meson >= 0.61.4 BuildRequires: gcc BuildRequires: gcc-c++ diff --git a/sources b/sources index c46f36e..b4ccea1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-22.3.0-rc3.tar.xz) = 4f67a3343b82ccf2ba0ed085199da4ae69cd9c144c998ca2730eb133fe78d9ad86fe967138a58bdeba8e387876d1aac4e37494faadb4dc77ce7f44704cb39e6b +SHA512 (mesa-22.3.0-rc4.tar.xz) = b07c8c3adbd3e8878e4849954ed8b2344d2827da85ccc2dbaa2a26e154193fb736cd1773838957ee597158c8678603ac76b3bf94ec15f8280a1fd65c5f7a67e3