OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
465e5a8
)
Revert "gallium/os_thread: simplify helper pipe_current_thread_get_time_nano"
author
Marek Olšák
<marek.olsak@amd.com>
Fri, 7 Sep 2018 20:42:00 +0000
(16:42 -0400)
committer
Marek Olšák
<marek.olsak@amd.com>
Fri, 7 Sep 2018 20:52:36 +0000
(16:52 -0400)
This reverts commit
6d477bc5460eec14c6a0d047a0384c9ce5c7609b
.
It fixes the Windows build hopefully.
src/gallium/auxiliary/os/os_thread.h
patch
|
blob
|
history
diff --git
a/src/gallium/auxiliary/os/os_thread.h
b/src/gallium/auxiliary/os/os_thread.h
index
322888b
..
f2629c5
100644
(file)
--- 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_ */