diff options
| -rw-r--r-- | intern/atomic/atomic_ops.h | 3 | ||||
| -rw-r--r-- | intern/atomic/intern/atomic_ops_ext.h | 12 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh.c | 4 |
3 files changed, 16 insertions, 3 deletions
diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h index 7fab8f2ac57..578cfb76eb6 100644 --- a/intern/atomic/atomic_ops.h +++ b/intern/atomic/atomic_ops.h @@ -112,6 +112,9 @@ ATOMIC_INLINE uint8_t atomic_fetch_and_and_uint8(uint8_t *p, uint8_t b); ATOMIC_INLINE int8_t atomic_fetch_and_or_int8(int8_t *p, int8_t b); ATOMIC_INLINE int8_t atomic_fetch_and_and_int8(int8_t *p, int8_t b); +ATOMIC_INLINE char atomic_fetch_and_or_char(char *p, char b); +ATOMIC_INLINE char atomic_fetch_and_and_char(char *p, char b); + ATOMIC_INLINE size_t atomic_add_and_fetch_z(size_t *p, size_t x); ATOMIC_INLINE size_t atomic_sub_and_fetch_z(size_t *p, size_t x); ATOMIC_INLINE size_t atomic_fetch_and_add_z(size_t *p, size_t x); diff --git a/intern/atomic/intern/atomic_ops_ext.h b/intern/atomic/intern/atomic_ops_ext.h index 34158a0b45e..51275e2b36b 100644 --- a/intern/atomic/intern/atomic_ops_ext.h +++ b/intern/atomic/intern/atomic_ops_ext.h @@ -180,6 +180,18 @@ ATOMIC_INLINE unsigned int atomic_cas_u(unsigned int *v, unsigned int old, unsig } /******************************************************************************/ +/* Char operations. */ +ATOMIC_INLINE char atomic_fetch_and_or_char(char *p, char b) +{ + return (char)atomic_fetch_and_or_uint8((uint8_t *)p, (uint8_t)b); +} + +ATOMIC_INLINE char atomic_fetch_and_and_char(char *p, char b) +{ + return (char)atomic_fetch_and_and_uint8((uint8_t *)p, (uint8_t)b); +} + +/******************************************************************************/ /* Pointer operations. */ ATOMIC_INLINE void *atomic_cas_ptr(void **v, void *old, void *_new) diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index aa8ab07518f..39d1d8e8510 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -1007,9 +1007,7 @@ static void pbvh_update_normals_store_task_cb(void *userdata, const int n) MVert *mvert = &bvh->verts[v]; /* mvert is shared between nodes, hence between threads. */ - if (atomic_fetch_and_and_uint8( - (uint8_t *)&mvert->flag, (uint8_t)~ME_VERT_PBVH_UPDATE) & ME_VERT_PBVH_UPDATE) - { + if (atomic_fetch_and_and_char(&mvert->flag, (char)~ME_VERT_PBVH_UPDATE) & ME_VERT_PBVH_UPDATE) { normalize_v3(vnors[v]); normal_float_to_short_v3(mvert->no, vnors[v]); } |