From 11b380ed0c61344b461ad2d1b66bf81e2c46b84b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Sun, 22 Oct 2017 17:38:50 +0200 Subject: [PATCH] gallium/u_threaded: mark queries flushed only for non-deferred flushes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The driver uses (and must use) the flushed flag of queries as a hint that it does not have to check for synchronization with currently queued up commands. Deferred flushes do not actually flush queued up commands, so we must not set the flushed flag for them. Found by inspection. Reviewed-by: Marek Olšák --- src/gallium/auxiliary/util/u_threaded_context.c | 8 +++++--- src/gallium/auxiliary/util/u_threaded_context.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gallium/auxiliary/util/u_threaded_context.c b/src/gallium/auxiliary/util/u_threaded_context.c index ccce12b..510201d 100644 --- a/src/gallium/auxiliary/util/u_threaded_context.c +++ b/src/gallium/auxiliary/util/u_threaded_context.c @@ -1809,9 +1809,11 @@ tc_flush(struct pipe_context *_pipe, struct pipe_fence_handle **fence, struct pipe_context *pipe = tc->pipe; struct threaded_query *tq, *tmp; - LIST_FOR_EACH_ENTRY_SAFE(tq, tmp, &tc->unflushed_queries, head_unflushed) { - tq->flushed = true; - LIST_DEL(&tq->head_unflushed); + if (!(flags & PIPE_FLUSH_DEFERRED)) { + LIST_FOR_EACH_ENTRY_SAFE(tq, tmp, &tc->unflushed_queries, head_unflushed) { + tq->flushed = true; + LIST_DEL(&tq->head_unflushed); + } } /* TODO: deferred flushes? */ diff --git a/src/gallium/auxiliary/util/u_threaded_context.h b/src/gallium/auxiliary/util/u_threaded_context.h index ac7bc3d..a9f79a6 100644 --- a/src/gallium/auxiliary/util/u_threaded_context.h +++ b/src/gallium/auxiliary/util/u_threaded_context.h @@ -264,7 +264,7 @@ struct threaded_query { /* The query is added to the list in end_query and removed in flush. */ struct list_head head_unflushed; - /* Whether pipe->flush has been called after end_query. */ + /* Whether pipe->flush has been called in non-deferred mode after end_query. */ bool flushed; }; -- 2.7.4