From 28c4c55810bea494c94e02c6a54757803985655d Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Fri, 25 Aug 2017 15:34:17 +0200 Subject: gallium/u_threaded: disallow discard_range if map_buffer is unsynchronized MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The discard range codepath takes precedence, so if we get both unsynchronized and discard_range, choose unsynchronized. Reviewed-by: Nicolai Hähnle --- src/gallium/auxiliary/util/u_threaded_context.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/auxiliary/util/u_threaded_context.c b/src/gallium/auxiliary/util/u_threaded_context.c index cbcd4056b29..8e3cc34f104 100644 --- a/src/gallium/auxiliary/util/u_threaded_context.c +++ b/src/gallium/auxiliary/util/u_threaded_context.c @@ -1337,8 +1337,10 @@ tc_improve_map_buffer_flags(struct threaded_context *tc, usage &= ~PIPE_TRANSFER_DISCARD_RANGE; /* Unsychronized buffer mappings don't have to synchronize the thread. */ - if (usage & PIPE_TRANSFER_UNSYNCHRONIZED) + if (usage & PIPE_TRANSFER_UNSYNCHRONIZED) { + usage &= ~PIPE_TRANSFER_DISCARD_RANGE; usage |= TC_TRANSFER_MAP_THREADED_UNSYNC; /* notify the driver */ + } /* Never invalidate inside the driver and never infer "unsynchronized". */ return usage | -- cgit v1.2.3