diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-06-29 09:18:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-06-30 09:53:55 +0300 |
commit | 2d4ec90497443dc28e342c539e65010c7f4a04bb (patch) | |
tree | 62d29a8c932d8b94f43fddf818c581432fb287a2 /source/blender/editors/transform/transform_mode_trackball.c | |
parent | 501d2443d03cce18985fab3ffad5d23238748f3e (diff) |
Transform: support multi-threading for most modes
Multi-threading support for transform modes: bevel-weight, crease,
push-pull, rotate, shear, shrink-fatten, skin-resize, to-sphere,
trackball & translate.
This is done using a parallel loop over transform data.
From testing a 1.5million polygon mesh on a 32 core system
the overall performance gains were between ~20-28%
To ensure the code is thread-safe arguments to shared data are const.
Reviewed By: mano-wii
Diffstat (limited to 'source/blender/editors/transform/transform_mode_trackball.c')
-rw-r--r-- | source/blender/editors/transform/transform_mode_trackball.c | 76 |
1 files changed, 66 insertions, 10 deletions
diff --git a/source/blender/editors/transform/transform_mode_trackball.c b/source/blender/editors/transform/transform_mode_trackball.c index d05077ef1ef..157283d08da 100644 --- a/source/blender/editors/transform/transform_mode_trackball.c +++ b/source/blender/editors/transform/transform_mode_trackball.c @@ -25,6 +25,7 @@ #include "BLI_math.h" #include "BLI_string.h" +#include "BLI_task.h" #include "BKE_context.h" #include "BKE_unit.h" @@ -40,6 +41,51 @@ #include "transform_snap.h" /* -------------------------------------------------------------------- */ +/** \name Transform (Rotation - Trackball) Element + * \{ */ + +/** + * \note Small arrays / data-structures should be stored copied for faster memory access. + */ +struct TransDataArgs_Trackball { + const TransInfo *t; + const TransDataContainer *tc; + const float axis[3]; + const float angle; + float mat[3][3]; +}; + +static void transdata_elem_trackball(const TransInfo *t, + const TransDataContainer *tc, + TransData *td, + const float axis[3], + const float angle, + const float mat[3][3]) +{ + float mat_buf[3][3]; + const float(*mat_final)[3] = mat; + if (t->flag & T_PROP_EDIT) { + axis_angle_normalized_to_mat3(mat_buf, axis, td->factor * angle); + mat_final = mat_buf; + } + ElementRotation(t, tc, td, mat_final, t->around); +} + +static void transdata_elem_trackball_fn(void *__restrict iter_data_v, + const int iter, + const TaskParallelTLS *__restrict UNUSED(tls)) +{ + struct TransDataArgs_Trackball *data = iter_data_v; + TransData *td = &data->tc->data[iter]; + if (td->flag & TD_SKIP) { + return; + } + transdata_elem_trackball(data->t, data->tc, td, data->axis, data->angle, data->mat); +} + +/** \} */ + +/* -------------------------------------------------------------------- */ /** \name Transform (Rotation - Trackball) * \{ */ @@ -59,17 +105,27 @@ static void applyTrackballValue(TransInfo *t, axis_angle_normalized_to_mat3(mat, axis, angle); FOREACH_TRANS_DATA_CONTAINER (t, tc) { - TransData *td = tc->data; - for (i = 0; i < tc->data_len; i++, td++) { - if (td->flag & TD_SKIP) { - continue; + if (tc->data_len < TRANSDATA_THREAD_LIMIT) { + TransData *td = tc->data; + for (i = 0; i < tc->data_len; i++, td++) { + if (td->flag & TD_SKIP) { + continue; + } + transdata_elem_trackball(t, tc, td, axis, angle, mat); } - - if (t->flag & T_PROP_EDIT) { - axis_angle_normalized_to_mat3(mat, axis, td->factor * angle); - } - - ElementRotation(t, tc, td, mat, t->around); + } + else { + struct TransDataArgs_Trackball data = { + .t = t, + .tc = tc, + .axis = {UNPACK3(axis)}, + .angle = angle, + }; + copy_m3_m3(data.mat, mat); + + TaskParallelSettings settings; + BLI_parallel_range_settings_defaults(&settings); + BLI_task_parallel_range(0, tc->data_len, &data, transdata_elem_trackball_fn, &settings); } } } |