summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authornobled <nobled@dreamwidth.org>2010-07-03 13:49:48 -0700
committerJosé Fonseca <jfonseca@vmware.com>2010-07-12 15:40:33 +0100
commit209009d75f88d25e2185b46ac9279a372d9a554c (patch)
tree63b7ab89b3f67da2e8132736f34ade13b8230bdc /src
parent7ce9a3adc5832a4bdcf778ca8ebccfdd029fc180 (diff)
downloadexternal_mesa3d-209009d75f88d25e2185b46ac9279a372d9a554c.zip
external_mesa3d-209009d75f88d25e2185b46ac9279a372d9a554c.tar.gz
external_mesa3d-209009d75f88d25e2185b46ac9279a372d9a554c.tar.bz2
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.
Diffstat (limited to 'src')
-rw-r--r--src/gallium/auxiliary/os/os_thread.h22
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;