gallium: draw_arrays/elements_instanced() are of type void.

[mesa.git] / src / gallium / include / pipe / p_atomic.h

diff --git a/src/gallium/include/pipe/p_atomic.h b/src/gallium/include/pipe/p_atomic.h
index eb2755864296fe2f15732dcea8c87ffed3fd87c9..0c3fbae428c1984787415ce3cc1829a00d7be707 100644 (file)
--- a/src/gallium/include/pipe/p_atomic.h
+++ b/src/gallium/include/pipe/p_atomic.h
@@ -16,7 +16,34 @@
 extern "C" {
 #endif
 
-#if (defined(PIPE_CC_GCC))
+
+/* Favor OS-provided implementations.
+ *
+ * Where no OS-provided implementation is available, fall back to
+ * locally coded assembly, compiler intrinsic or ultimately a
+ * mutex-based implementation.
+ */
+#if (defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY) || \
+     defined(PIPE_SUBSYSTEM_WINDOWS_MINIPORT))
+#define PIPE_ATOMIC_OS_UNLOCKED 
+#elif (defined(PIPE_CC_MSVC) && defined(PIPE_SUBSYSTEM_WINDOWS_USER))
+#define PIPE_ATOMIC_OS_MS_INTERLOCK
+#elif (defined(PIPE_CC_MSVC) && defined(PIPE_ARCH_X86))
+#define PIPE_ATOMIC_ASM_MSVC_X86                
+#elif (defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86))
+#define PIPE_ATOMIC_ASM_GCC_X86
+#elif defined(PIPE_CC_GCC)
+#define PIPE_ATOMIC_GCC_INTRINSIC
+#else
+#define PIPE_ATOMIC_MUTEX                       
+#endif
+
+
+
+#if defined(PIPE_ATOMIC_ASM_GCC_X86)
+
+#define PIPE_ATOMIC "GCC x86 assembly"
+
 struct pipe_atomic {
    int32_t count;
 };
@@ -28,36 +55,65 @@ struct pipe_atomic {
 static INLINE boolean
 p_atomic_dec_zero(struct pipe_atomic *v)
 {
-#ifdef __i386__
    unsigned char c;
 
    __asm__ __volatile__("lock; decl %0; sete %1":"+m"(v->count), "=qm"(c)
                        ::"memory");
 
    return c != 0;
-#else  /* __i386__*/
-   return (__sync_sub_and_fetch(&v->count, 1) == 0);
-#endif /* __i386__*/
 }
 
 static INLINE void
 p_atomic_inc(struct pipe_atomic *v)
 {
-#ifdef __i386__
    __asm__ __volatile__("lock; incl %0":"+m"(v->count));
-#else /* __i386__*/
-   (void) __sync_add_and_fetch(&v->count, 1);
-#endif /* __i386__*/
 }
 
 static INLINE void
 p_atomic_dec(struct pipe_atomic *v)
 {
-#ifdef __i386__
    __asm__ __volatile__("lock; decl %0":"+m"(v->count));
-#else /* __i386__*/
+}
+
+static INLINE int32_t
+p_atomic_cmpxchg(struct pipe_atomic *v, int32_t old, int32_t _new)
+{
+   return __sync_val_compare_and_swap(&v->count, old, _new);
+}
+#endif
+
+
+
+/* Implementation using GCC-provided synchronization intrinsics
+ */
+#if defined(PIPE_ATOMIC_GCC_INTRINSIC)
+
+#define PIPE_ATOMIC "GCC Sync Intrinsics"
+
+struct pipe_atomic {
+   int32_t count;
+};
+
+#define p_atomic_set(_v, _i) ((_v)->count = (_i))
+#define p_atomic_read(_v) ((_v)->count)
+
+
+static INLINE boolean
+p_atomic_dec_zero(struct pipe_atomic *v)
+{
+   return (__sync_sub_and_fetch(&v->count, 1) == 0);
+}
+
+static INLINE void
+p_atomic_inc(struct pipe_atomic *v)
+{
+   (void) __sync_add_and_fetch(&v->count, 1);
+}
+
+static INLINE void
+p_atomic_dec(struct pipe_atomic *v)
+{
    (void) __sync_sub_and_fetch(&v->count, 1);
-#endif /* __i386__*/
 }
 
 static INLINE int32_t
@@ -65,8 +121,16 @@ p_atomic_cmpxchg(struct pipe_atomic *v, int32_t old, int32_t _new)
 {
    return __sync_val_compare_and_swap(&v->count, old, _new);
 }
+#endif
+
 
-#elif (defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY) || defined(PIPE_SUBSYSTEM_WINDOWS_MINIPORT)) /* (defined(PIPE_CC_GCC)) */
+
+/* Unlocked version for single threaded environments, such as some
+ * windows kernel modules.
+ */
+#if defined(PIPE_ATOMIC_OS_UNLOCKED) 
+
+#define PIPE_ATOMIC "Unlocked"
 
 struct pipe_atomic
 {
@@ -80,7 +144,14 @@ struct pipe_atomic
 #define p_atomic_dec(_v) ((void) (_v)->count--)
 #define p_atomic_cmpxchg(_v, old, _new) ((_v)->count == old ? (_v)->count = (_new) : (_v)->count)
 
-#elif (defined(PIPE_ARCH_X86) && defined(PIPE_CC_MSVC)) /* (defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY) || defined(PIPE_SUBSYSTEM_WINDOWS_MINIPORT)) */
+#endif
+
+
+/* Locally coded assembly for MSVC on x86:
+ */
+#if defined(PIPE_ATOMIC_ASM_MSVC_X86)
+
+#define PIPE_ATOMIC "MSVC x86 assembly"
 
 struct pipe_atomic
 {
@@ -143,12 +214,18 @@ p_atomic_cmpxchg(struct pipe_atomic *v, int32_t old, int32_t _new)
 
    return orig;
 }
+#endif
 
-#elif (defined(PIPE_SUBSYSTEM_WINDOWS_USER)) /* (defined(PIPE_ARCH_X86) && defined(PIPE_CC_MSVC)) */
+
+#if defined(PIPE_ATOMIC_OS_MS_INTERLOCK)
+
+#define PIPE_ATOMIC "MS userspace interlocks"
+
+#include <windows.h>
 
 struct pipe_atomic
 {
-   long count;
+   volatile long count;
 };
 
 #define p_atomic_set(_v, _i) ((_v)->count = (_i))
@@ -157,7 +234,7 @@ struct pipe_atomic
 static INLINE boolean
 p_atomic_dec_zero(struct pipe_atomic *v)
 {
-   return InterlockedDecrement(&v->count);
+   return InterlockedDecrement(&v->count) == 0;
 }
 
 static INLINE void
@@ -178,7 +255,13 @@ p_atomic_cmpxchg(struct pipe_atomic *v, int32_t old, int32_t _new)
    return InterlockedCompareExchange(&v->count, _new, old);
 }
 
-#else /* (defined(PIPE_SUBSYSTEM_WINDOWS_USER)) */
+#endif
+
+
+
+#if defined(PIPE_ATOMIC_MUTEX)
+
+#define PIPE_ATOMIC "mutex-based fallback"
 
 #include "pipe/p_thread.h"
 
@@ -254,7 +337,14 @@ p_atomic_cmpxchg(struct pipe_atomic *v, int32_t old, int32_t _new)
    return ret;
 }
 
-#endif /* (defined(PIPE_CC_GCC)) */
+#endif 
+
+
+#ifndef PIPE_ATOMIC
+#error "No pipe_atomic implementation selected"
+#endif
+
+
 
 #ifdef __cplusplus
 }