From 5066839ffdbeac5b8d24f83e7c55cb20545cd48b Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Wed, 9 Jun 2021 13:29:50 -0700 Subject: Revert "st/mesa: execute glFlush asynchronously if no image has been imported/exported" A number of the piglit glx tests use multiple contexts on a single thread, and previously the flush in MakeCurrent() was enforcing the ordering between draws on those different contexts. When that flush made ASYNC, now there is nothing ordering the draws because we have two (or more) driver threads for a single frontend thread which is using nothing more than glxMakeCurrent() to enforce the ordering. This reverts commit 057a702a3f6a78a8bcd347a74e5a79d70dfc4153. Fixes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4903 Acked-by: Mike Blumenkrantz Part-of: --- src/mesa/state_tracker/st_cb_flush.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mesa/state_tracker/st_cb_flush.c') diff --git a/src/mesa/state_tracker/st_cb_flush.c b/src/mesa/state_tracker/st_cb_flush.c index ee72c331cdd..bec1c2f177b 100644 --- a/src/mesa/state_tracker/st_cb_flush.c +++ b/src/mesa/state_tracker/st_cb_flush.c @@ -98,7 +98,7 @@ st_glFlush(struct gl_context *ctx) * synchronization issues. Calling finish() here will just hide * problems that need to be fixed elsewhere. */ - st_flush(st, NULL, ctx->Shared->HasExternallySharedImages ? 0 : PIPE_FLUSH_ASYNC); + st_flush(st, NULL, 0); st_manager_flush_frontbuffer(st); } -- cgit v1.2.3