blender
/
blender
137
415
Fork 598
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Alternative Upload geometry data in parallel to multiple GPUs using the "Multi-Device" #107552

Open
William Leeson wants to merge 137 commits from leesonw/blender-cluster:upload_changed into main
pull from: leesonw/blender-cluster:upload_changed
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 137 Files Changed 43 +20 -8
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b75f6ad788 - Show all commits

28
intern/cycles/device/device.cpp
View File

@ -53,13 +53,24 @@ void Device::build_bvh(BVH *bvh, DeviceScene *dscene, Progress &progress, bool r
{
assert(bvh->params.bvh_layout == BVH_LAYOUT_BVH2);
BVH2 *const bvh2 = static_cast<BVH2 *>(bvh);
static std::atomic<int> building{0};
/* Top level BVH2 build must wait on all other BVH2 builds to finish
otherwise the top level BVH2 will not have all the correct data
*/
if(bvh2->params.top_level) {
thread_scoped_lock build_wait_lock(bvh2->build_mutex);
/* Wait for other BVH2 builds to complete before proceeding */
VLOG_INFO << std::this_thread::get_id() << ":" << bvh2 << " Waiting on other BVH2 builds.";
bvh2->build_cv.wait(build_wait_lock, [=]() { return (building == 0); });
VLOG_INFO << std::this_thread::get_id() << ":" << bvh2 << " Done waiting on other BVH2 builds";
}
thread_scoped_lock build_lock(bvh2->build_mutex, std::try_to_lock);
if (build_lock) {
/* Has the BVH already been built */
/* Has the BVH already been built? */
if (!bvh->built) {
building++;
/* Build the BVH */
VLOG_INFO << std::this_thread::get_id() << ": Performing BVH2 build.";
VLOG_INFO << std::this_thread::get_id() << ":" << bvh2 << " Performing BVH2 build.";
if (refit) {
bvh2->refit(progress);
}
@ -67,10 +78,11 @@ void Device::build_bvh(BVH *bvh, DeviceScene *dscene, Progress &progress, bool r
bvh2->build(progress, &stats);
}
bvh->built = true;
VLOG_INFO << std::this_thread::get_id() << ": done building BVH2";
VLOG_INFO << std::this_thread::get_id() << ":" << bvh2 << " Done building BVH2";
building--;
}
else {
VLOG_INFO << std::this_thread::get_id() << ": BVH2 Already built";
VLOG_INFO << std::this_thread::get_id() << ":" << bvh2 << " BVH2 Already built";
}
bvh2->build_cv.notify_all();
}
@ -80,11 +92,11 @@ void Device::build_bvh(BVH *bvh, DeviceScene *dscene, Progress &progress, bool r
if (bvh2->params.top_level) {
thread_scoped_lock build_wait_lock(bvh2->build_mutex);
/* wait for BVH build to complete before proceeding */
VLOG_INFO << std::this_thread::get_id() << ": Waiting on BVH2 build.";
VLOG_INFO << std::this_thread::get_id() << ":" << bvh2 << " Waiting on BVH2 build.";
bvh2->build_cv.wait(build_wait_lock, [=]() { return (bvh2->built); });
VLOG_INFO << std::this_thread::get_id() << ": done waiting on BVH2 build";
VLOG_INFO << std::this_thread::get_id() << ":" << bvh2 << " Done waiting on BVH2 build";
} else {
VLOG_INFO << std::this_thread::get_id() << ": Skipping BVH2 build.";
VLOG_INFO << std::this_thread::get_id() << ":" << bvh2 << " Skipping BVH2 build.";
}
}
}