diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-01-11 17:14:30 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-01-11 17:14:30 +0300 |
| commit | 656b9a46b356d304a688d8661c1958c57b454828 (patch) | |
| tree | b1a04b0df8675c45d0133d178b995ebc99a970b3 /source/blender/depsgraph/intern | |
| parent | c36f4a7f7f370ebb6e944d9893d2677232d3b7f8 (diff) | |
| parent | 38d480fb54dbac5bb87b002e4ee22c1d3df89f90 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/intern')
| -rw-r--r-- | source/blender/depsgraph/intern/eval/deg_eval.cc | 3 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/eval/deg_eval_flush.cc | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc index 116f853ebdf..a6c6a16a528 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval.cc @@ -132,12 +132,11 @@ static void calculate_pending_func( static void calculate_pending_parents(Depsgraph *graph) { const int num_operations = graph->operations.size(); - const bool do_threads = (num_operations > 256); CalculatePengindData data; data.graph = graph; ParallelRangeSettings settings; BLI_parallel_range_settings_defaults(&settings); - settings.use_threading = do_threads; + settings.min_iter_per_thread = 1024; BLI_task_parallel_range(0, num_operations, &data, diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc index c3b1f56a71b..74c3cd28455 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc @@ -100,7 +100,7 @@ BLI_INLINE void flush_prepare(Depsgraph *graph) const int num_operations = graph->operations.size(); ParallelRangeSettings settings; BLI_parallel_range_settings_defaults(&settings); - settings.use_threading = (num_operations > 256); + settings.min_iter_per_thread = 1024; BLI_task_parallel_range(0, num_operations, graph, flush_init_operation_node_func, @@ -110,7 +110,7 @@ BLI_INLINE void flush_prepare(Depsgraph *graph) const int num_id_nodes = graph->id_nodes.size(); ParallelRangeSettings settings; BLI_parallel_range_settings_defaults(&settings); - settings.use_threading = (num_id_nodes > 256); + settings.min_iter_per_thread = 1024; BLI_task_parallel_range(0, num_id_nodes, graph, flush_init_id_node_func, @@ -310,10 +310,9 @@ void deg_graph_clear_tags(Depsgraph *graph) { /* Go over all operation nodes, clearing tags. */ const int num_operations = graph->operations.size(); - const bool do_threads = num_operations > 256; ParallelRangeSettings settings; BLI_parallel_range_settings_defaults(&settings); - settings.use_threading = do_threads; + settings.min_iter_per_thread = 1024; BLI_task_parallel_range(0, num_operations, graph, graph_clear_func, |