[Mesa-dev] [PATCH 5/5] os: remove gratuitous pipe_barrier placeholder code

nobled nobled at dreamwidth.org
Sat Jul 3 13:49:48 PDT 2010


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;
-- 
1.5.4.3


More information about the mesa-dev mailing list