From c569988977252da904d290baff760c904a133707 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 23 Nov 2022 07:44:54 +1000 Subject: [PATCH] enable hasvk + regression fix --- ...-async-glthread-flushing-for-GLX_EXT.patch | 41 +++++++++++++++++++ mesa.spec | 5 ++- 2 files changed, 45 insertions(+), 1 deletion(-) create 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 new file mode 100644 index 0000000..af02b2c --- /dev/null +++ b/0001-st-mesa-suppress-async-glthread-flushing-for-GLX_EXT.patch @@ -0,0 +1,41 @@ +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 8481dd7..6e9a0a0 100644 --- a/mesa.spec +++ b/mesa.spec @@ -16,7 +16,7 @@ %global with_i915 1 %global with_iris 1 %global with_xa 1 -%global platform_vulkan ,intel +%global platform_vulkan ,intel,intel_hasvk %endif %ifarch aarch64 @@ -65,6 +65,9 @@ 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++