From 72ce22f99180bf55d83091e83980e8ecac3aaa70 Mon Sep 17 00:00:00 2001 From: Michel Zou Date: Mon, 19 Oct 2020 20:52:26 +0200 Subject: [PATCH] lavapipe: fix usleep usage in lvp_device Acked-by: Jose Fonseca Reviewed-by: Dave Airlie Part-of: --- src/gallium/frontends/lavapipe/lvp_device.c | 5 +++-- src/util/timespec.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index 86dcb1f1b1b..dea23eca5de 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -36,6 +36,7 @@ #include "util/u_thread.h" #include "util/u_atomic.h" #include "util/timespec.h" +#include "os_time.h" static VkResult lvp_physical_device_init(struct lvp_physical_device *device, @@ -1026,14 +1027,14 @@ static VkResult queue_wait_idle(struct lvp_queue *queue, uint64_t timeout) return p_atomic_read(&queue->count) == 0 ? VK_SUCCESS : VK_TIMEOUT; if (timeout == UINT64_MAX) while (p_atomic_read(&queue->count)) - usleep(100); + os_time_sleep(100); else { struct timespec t, current; clock_gettime(CLOCK_MONOTONIC, ¤t); timespec_add_nsec(&t, ¤t, timeout); bool timedout = false; while (p_atomic_read(&queue->count) && !(timedout = timespec_passed(CLOCK_MONOTONIC, &t))) - usleep(10); + os_time_sleep(10); if (timedout) return VK_TIMEOUT; } diff --git a/src/util/timespec.h b/src/util/timespec.h index 465adec892c..fbc3a89bd11 100644 --- a/src/util/timespec.h +++ b/src/util/timespec.h @@ -312,7 +312,7 @@ timespec_after(const struct timespec *a, const struct timespec *b) (a->tv_sec > b->tv_sec); } -#ifndef _WIN32 +#ifndef _MSC_VER /** * Checks whether a timespec value is after the current time *