From 569c230e228dd6b11b152aba2606e390d08558b5 Mon Sep 17 00:00:00 2001 From: =?utf8?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: (cherry picked from commit d871958702ebcd46213cd09b91b9b05685f9be62) --- .pick_status.json | 2 +- src/mesa/state_tracker/st_manager.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 8dd9981..1043ec2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -517,7 +517,7 @@ "description": "st/mesa: suppress async glthread flushing for GLX_EXT_texture_from_pixmap", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "3da170faaec2a57d76e668ab56781621c23c6703" }, diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index 0e8644f..575b729 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.7.4