[Bf-blender-cvs] [7e9103b] master: atomic_ops: add atomic_fetch_and_and_uint8 wrapper.

Bastien Montagne noreply at git.blender.org
Wed Jan 27 12:26:34 CET 2016


Commit: 7e9103b49c6bdadc0c72fa369261060e67c9bc85
Author: Bastien Montagne
Date:   Wed Jan 27 11:46:27 2016 +0100
Branches: master
https://developer.blender.org/rB7e9103b49c6bdadc0c72fa369261060e67c9bc85

atomic_ops: add atomic_fetch_and_and_uint8 wrapper.

Needed by incomming changes in pbvh.c.

Note that we make it much simpler than for other primitives in this file - think
we could revise its content to make it simpler one day...

===================================================================

M	intern/atomic/atomic_ops.h

===================================================================

diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h
index d8161d1..c7bb050 100644
--- a/intern/atomic/atomic_ops.h
+++ b/intern/atomic/atomic_ops.h
@@ -90,6 +90,8 @@ ATOMIC_INLINE uint32_t atomic_add_uint32(uint32_t *p, uint32_t x);
 ATOMIC_INLINE uint32_t atomic_sub_uint32(uint32_t *p, uint32_t x);
 ATOMIC_INLINE uint32_t atomic_cas_uint32(uint32_t *v, uint32_t old, uint32_t _new);
 
+ATOMIC_INLINE uint8_t atomic_fetch_and_and_uint8(uint8_t *p, uint8_t b);
+
 ATOMIC_INLINE size_t atomic_add_z(size_t *p, size_t x);
 ATOMIC_INLINE size_t atomic_sub_z(size_t *p, size_t x);
 ATOMIC_INLINE size_t atomic_cas_z(size_t *v, size_t old, size_t _new);
@@ -378,6 +380,26 @@ atomic_cas_uint32(uint32_t *v, uint32_t old, uint32_t _new)
 #endif
 
 /******************************************************************************/
+/* 8-bit operations. */
+#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1
+ATOMIC_INLINE uint8_t
+atomic_fetch_and_and_uint8(uint8_t *p, uint8_t b)
+{
+	return __sync_fetch_and_and(p, b);
+}
+#elif (defined(_MSC_VER))
+#include <intrin.h>
+#pragma intrinsic(_InterlockedAnd8)
+ATOMIC_INLINE uint8_t
+atomic_fetch_and_and_uint8(uint8_t *p, uint8_t b)
+{
+	return InterlockedAnd8((char *)p, (char)b);
+}
+#else
+#  error "Missing implementation for 8-bit atomic operations"
+#endif
+
+/******************************************************************************/
 /* size_t operations. */
 ATOMIC_INLINE size_t
 atomic_add_z(size_t *p, size_t x)




More information about the Bf-blender-cvs mailing list