Mesa (main): zink: check last_finished before timeline waiting

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 25ad69968be16e9ae15cf5a5463519736d39d49f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=25ad69968be16e9ae15cf5a5463519736d39d49f

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed May 26 08:19:35 2021 -0400

zink: check last_finished before timeline waiting

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11686>

---

 src/gallium/drivers/zink/zink_screen.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index a21988cc80f..88e0d723fb5 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1499,6 +1499,10 @@ bool
 zink_screen_timeline_wait(struct zink_screen *screen, uint32_t batch_id, uint64_t timeout)
 {
    VkSemaphoreWaitInfo wi = {0};
+
+   if (zink_screen_check_last_finished(screen, batch_id))
+      return true;
+
    wi.sType = VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO;
    wi.semaphoreCount = 1;
    /* handle batch_id overflow */