Mesa (master): os: remove gratuitous pipe_barrier placeholder code
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Mon Jul 12 14:41:21 UTC 2010
Module: Mesa
Branch: master
Commit: 209009d75f88d25e2185b46ac9279a372d9a554c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=209009d75f88d25e2185b46ac9279a372d9a554c
Author: nobled <nobled at dreamwidth.org>
Date: Sat Jul 3 13:49:48 2010 -0700
os: remove gratuitous pipe_barrier placeholder code
There's already an implementation of pipe_barrier using
the other pipe_* primitives; just use that on Windows, too.
Now Windows passes pipe_barrier_test.
---
src/gallium/auxiliary/os/os_thread.h | 22 +---------------------
1 files changed, 1 insertions(+), 21 deletions(-)
diff --git a/src/gallium/auxiliary/os/os_thread.h b/src/gallium/auxiliary/os/os_thread.h
index 036f6ba..a084310 100644
--- a/src/gallium/auxiliary/os/os_thread.h
+++ b/src/gallium/auxiliary/os/os_thread.h
@@ -326,27 +326,7 @@ static INLINE void pipe_barrier_wait(pipe_barrier *barrier)
}
-#elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
-
-/* XXX FIX THIS */
-typedef unsigned pipe_barrier;
-
-static INLINE void pipe_barrier_init(pipe_barrier *barrier, unsigned count)
-{
- /* XXX we could implement barriers with a mutex and condition var */
-}
-
-static INLINE void pipe_barrier_destroy(pipe_barrier *barrier)
-{
-}
-
-static INLINE void pipe_barrier_wait(pipe_barrier *barrier)
-{
- assert(0);
-}
-
-
-#else
+#else /* If the OS doesn't have its own, implement barriers using a mutex and a condvar */
typedef struct {
unsigned count;
More information about the mesa-commit
mailing list