bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

CleanUp: Remove thread_id from TaskFreeFunction

Browse Source 
It isn't used; cleanup related to {D7475}
This commit is contained in:
Jeroen Bakker 2020-04-21 15:57:51 +02:00
parent 2d6ad88466
commit b08e18ff36
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenlib/BLI_task.h
View File

@ -71,7 +71,7 @@ typedef enum TaskPriority {
typedef struct TaskPool TaskPool; typedef struct TaskPool TaskPool;
typedef void (*TaskRunFunction)(TaskPool *__restrict pool, void *taskdata, int threadid); typedef void (*TaskRunFunction)(TaskPool *__restrict pool, void *taskdata, int threadid);
typedef void (*TaskFreeFunction)(TaskPool *__restrict pool, void *taskdata, int threadid); typedef void (*TaskFreeFunction)(TaskPool *__restrict pool, void *taskdata);
TaskPool *BLI_task_pool_create(TaskScheduler *scheduler, void *userdata, TaskPriority priority); TaskPool *BLI_task_pool_create(TaskScheduler *scheduler, void *userdata, TaskPriority priority);
TaskPool *BLI_task_pool_create_background(TaskScheduler *scheduler, TaskPool *BLI_task_pool_create_background(TaskScheduler *scheduler,

4
source/blender/blenlib/intern/task_pool.cc
View File

@ -230,11 +230,11 @@ typedef struct TaskThread {
} TaskThread; } TaskThread;
/* Helper */ /* Helper */
BLI_INLINE void task_data_free(Task *task, const int thread_id) BLI_INLINE void task_data_free(Task *task, const int UNUSED(thread_id))
{ {
if (task->free_taskdata) { if (task->free_taskdata) {
if (task->freedata) { if (task->freedata) {
task->freedata(task->pool, task->taskdata, thread_id); task->freedata(task->pool, task->taskdata);
} }
else { else {
MEM_freeN(task->taskdata); MEM_freeN(task->taskdata);

4
source/blender/editors/space_file/filelist.c
View File

@ -1306,9 +1306,7 @@ static void filelist_cache_preview_runf(TaskPool *__restrict pool,
// printf("%s: End (%d)...\n", __func__, threadid); // printf("%s: End (%d)...\n", __func__, threadid);
} }
static void filelist_cache_preview_freef(TaskPool *__restrict UNUSED(pool), static void filelist_cache_preview_freef(TaskPool *__restrict UNUSED(pool), void *taskdata)
void *taskdata,
int UNUSED(threadid))
{ {
FileListEntryPreviewTaskData *preview_taskdata = taskdata; FileListEntryPreviewTaskData *preview_taskdata = taskdata;
FileListEntryPreview *preview = preview_taskdata->preview; FileListEntryPreview *preview = preview_taskdata->preview;