diff options
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_task.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/task_iterator.c | 8 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/task_pool.cc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenlib/BLI_task.h b/source/blender/blenlib/BLI_task.h index 78370e98202..def41cf0a82 100644 --- a/source/blender/blenlib/BLI_task.h +++ b/source/blender/blenlib/BLI_task.h @@ -105,7 +105,7 @@ void BLI_task_pool_cancel(TaskPool *pool); bool BLI_task_pool_canceled(TaskPool *pool); /* optional userdata pointer to pass along to run function */ -void *BLI_task_pool_userdata(TaskPool *pool); +void *BLI_task_pool_user_data(TaskPool *pool); /* optional mutex to use from run function */ ThreadMutex *BLI_task_pool_user_mutex(TaskPool *pool); diff --git a/source/blender/blenlib/intern/task_iterator.c b/source/blender/blenlib/intern/task_iterator.c index 0d1c96612e3..8a596879b2c 100644 --- a/source/blender/blenlib/intern/task_iterator.c +++ b/source/blender/blenlib/intern/task_iterator.c @@ -234,7 +234,7 @@ BLI_INLINE bool parallel_range_next_iter_get(TaskParallelRangePool *__restrict r static void parallel_range_func(TaskPool *__restrict pool, void *tls_data_idx, int thread_id) { - TaskParallelRangePool *__restrict range_pool = BLI_task_pool_userdata(pool); + TaskParallelRangePool *__restrict range_pool = BLI_task_pool_user_data(pool); TaskParallelTLS tls = { .thread_id = thread_id, .userdata_chunk = NULL, @@ -446,7 +446,7 @@ static void parallel_range_func_finalize(TaskPool *__restrict pool, void *v_state, int UNUSED(thread_id)) { - TaskParallelRangePool *__restrict range_pool = BLI_task_pool_userdata(pool); + TaskParallelRangePool *__restrict range_pool = BLI_task_pool_user_data(pool); TaskParallelRangeState *state = v_state; for (int i = 0; i < range_pool->num_tasks; i++) { @@ -666,7 +666,7 @@ static void parallel_iterator_func_do(TaskParallelIteratorState *__restrict stat static void parallel_iterator_func(TaskPool *__restrict pool, void *userdata_chunk, int threadid) { - TaskParallelIteratorState *__restrict state = BLI_task_pool_userdata(pool); + TaskParallelIteratorState *__restrict state = BLI_task_pool_user_data(pool); parallel_iterator_func_do(state, userdata_chunk, threadid); } @@ -862,7 +862,7 @@ typedef struct ParallelMempoolState { static void parallel_mempool_func(TaskPool *__restrict pool, void *taskdata, int UNUSED(threadid)) { - ParallelMempoolState *__restrict state = BLI_task_pool_userdata(pool); + ParallelMempoolState *__restrict state = BLI_task_pool_user_data(pool); BLI_mempool_iter *iter = taskdata; MempoolIterData *item; diff --git a/source/blender/blenlib/intern/task_pool.cc b/source/blender/blenlib/intern/task_pool.cc index 8085d495248..95d5388435b 100644 --- a/source/blender/blenlib/intern/task_pool.cc +++ b/source/blender/blenlib/intern/task_pool.cc @@ -992,7 +992,7 @@ bool BLI_task_pool_canceled(TaskPool *pool) return pool->do_cancel; } -void *BLI_task_pool_userdata(TaskPool *pool) +void *BLI_task_pool_user_data(TaskPool *pool) { return pool->userdata; } |