Module: Mesa Branch: master Commit: 7ac52c2e38f3003aad236f97c843905e682008df URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ac52c2e38f3003aad236f97c843905e682008df
Author: Marek Olšák <[email protected]> Date: Fri Sep 7 16:42:00 2018 -0400 Revert "gallium/os_thread: simplify helper pipe_current_thread_get_time_nano" This reverts commit 6d477bc5460eec14c6a0d047a0384c9ce5c7609b. It fixes the Windows build hopefully. --- src/gallium/auxiliary/os/os_thread.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gallium/auxiliary/os/os_thread.h b/src/gallium/auxiliary/os/os_thread.h index 322888b825..f2629c5ffe 100644 --- a/src/gallium/auxiliary/os/os_thread.h +++ b/src/gallium/auxiliary/os/os_thread.h @@ -165,7 +165,11 @@ pipe_tsd_set(pipe_tsd *tsd, void *value) static inline int64_t pipe_current_thread_get_time_nano(void) { - return u_thread_get_time_nano(thrd_current()); +#if defined(HAVE_PTHREAD) + return u_thread_get_time_nano(pthread_self()); +#else + return 0; +#endif } #endif /* OS_THREAD_H_ */ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
