blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

Fix T70715: sculpt brush jitter after recent TBB changes 

Fix error in the splitting constructor, and some refactoring.
This commit is contained in:
Brecht Van Lommel 2019-10-11 00:44:29 +02:00
parent b8f769fee8
commit 00b6f8ef90
Notes: blender-bot 2023-02-14 06:00:49 +01:00 
Referenced by issue #70715, Sculpt : Brush Cursor too jittery even with Default Settings.
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
source/blender/blenkernel/intern/pbvh_parallel.cc
View File

@ -36,32 +36,42 @@ struct PBVHTask {
void *userdata_chunk;
bool userdata_chunk_free;
PBVHTask()
/* Root constructor. */
PBVHTask(PBVHParallelRangeFunc func, void *userdata, const PBVHParallelSettings *settings)
: func(func), userdata(userdata), settings(settings)
{
init_chunk(settings->userdata_chunk);
}
/* Copy constructor. */
PBVHTask(const PBVHTask &other)
: func(other.func),
userdata(other.userdata),
settings(other.settings),
userdata_chunk(0),
userdata_chunk_free(false)
: func(other.func), userdata(other.userdata), settings(other.settings)
{
if (other.userdata_chunk) {
userdata_chunk = MEM_mallocN(settings->userdata_chunk_size, "PBVHTask");
memcpy(userdata_chunk, other.userdata_chunk, settings->userdata_chunk_size);
userdata_chunk_free = true;
}
init_chunk(other.userdata_chunk);
}
PBVHTask(PBVHTask &other, tbb::split) : PBVHTask(other)
/* Splitting constructor for parallel reduce. */
PBVHTask(PBVHTask &other, tbb::split)
: func(other.func), userdata(other.userdata), settings(other.settings)
{
init_chunk(settings->userdata_chunk);
}
~PBVHTask()
{
if (userdata_chunk_free) {
MEM_freeN(userdata_chunk);
MEM_SAFE_FREE(userdata_chunk);
}
void init_chunk(void *from_chunk)
{
if (from_chunk) {
userdata_chunk = MEM_mallocN(settings->userdata_chunk_size, "PBVHTask");
memcpy(userdata_chunk, from_chunk, settings->userdata_chunk_size);
userdata_chunk_free = true;
}
else {
userdata_chunk = NULL;
userdata_chunk_free = false;
}
}
@ -111,15 +121,13 @@ void BKE_pbvh_parallel_range(const int start,
#ifdef WITH_TBB
/* Multithreading. */
if (settings->use_threading) {
PBVHTask task;
task.func = func;
task.userdata = userdata;
task.settings = settings;
task.userdata_chunk = settings->userdata_chunk;
task.userdata_chunk_free = false;
PBVHTask task(func, userdata, settings);
if (settings->func_reduce) {
parallel_reduce(tbb::blocked_range<int>(start, stop), task);
if (settings->userdata_chunk) {
memcpy(settings->userdata_chunk, task.userdata_chunk, settings->userdata_chunk_size);
}
}
else {
parallel_for(tbb::blocked_range<int>(start, stop), task);