diff options
| -rw-r--r-- | src/gallium/drivers/zink/zink_resource.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index a660eee55e4..c7f19ca8449 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -849,8 +849,14 @@ buffer_transfer_map(struct zink_context *ctx, struct zink_resource *res, unsigne } else if ((usage & PIPE_MAP_READ) && !(usage & PIPE_MAP_PERSISTENT)) { assert(!(usage & (TC_TRANSFER_MAP_THREADED_UNSYNC | PIPE_MAP_THREAD_SAFE))); uint32_t latest_write = get_most_recent_access(res, ZINK_RESOURCE_ACCESS_WRITE); - if (latest_write) - zink_wait_on_batch(ctx, latest_write); + if (latest_write) { + if (usage & PIPE_MAP_DONTBLOCK) { + if (latest_write == ctx->curr_batch || + !zink_check_batch_completion(ctx, latest_write)) + return NULL; + } else + zink_wait_on_batch(ctx, latest_write); + } } if (!ptr) { |