diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-23 18:29:00 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-23 18:29:00 +0300 |
| commit | 5330e7fd292e1bb5ea3ba08f80fa6b9be5f0d987 (patch) | |
| tree | ffff29bbc9acba22409f21f773f843d7622558b8 /source/blender/blenlib | |
| parent | 35e8138c95d59851c772f96e5e5f507055fe38f0 (diff) | |
| parent | 580b34e52b0cf231cea70891831efd4b1b1c4ee2 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/task.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/task.c b/source/blender/blenlib/intern/task.c index e050f3148b8..d69241c3737 100644 --- a/source/blender/blenlib/intern/task.c +++ b/source/blender/blenlib/intern/task.c @@ -1003,8 +1003,7 @@ BLI_INLINE bool parallel_range_next_iter_get( ParallelRangeState * __restrict state, int * __restrict iter, int * __restrict count) { - uint32_t uval = atomic_fetch_and_add_uint32((uint32_t *)(&state->iter), state->chunk_size); - int previter = *(int32_t *)&uval; + int previter = atomic_fetch_and_add_int32(&state->iter, state->chunk_size); *iter = previter; *count = max_ii(0, min_ii(state->chunk_size, state->stop - previter)); @@ -1124,7 +1123,7 @@ static void task_parallel_range_ex( } num_tasks = min_ii(num_tasks, (stop - start) / state.chunk_size); - atomic_fetch_and_add_uint32((uint32_t *)(&state.iter), 0); + atomic_fetch_and_add_int32(&state.iter, 0); if (use_userdata_chunk) { userdata_chunk_array = MALLOCA(userdata_chunk_size * num_tasks); |