blender
/
blender
137
415
Fork 598
Code Issues 6.3k Pull Requests 770 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 +13 -3
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e04384f20d - Show all commits

16
intern/cycles/bvh/multi.cpp
View File

@ -22,9 +22,19 @@ BVHMulti::~BVHMulti() { }
BVH *BVHMulti::get_device_bvh(const Device *subdevice)
{
int id = device->device_number(subdevice);
resize_sub_bvhs_if_needed(id);
return sub_bvhs[id].get();
BVH *bvh = NULL;
if (subdevice == device) {
bvh = this;
}
else {
int id = device->device_number(subdevice);
assert(id != -1);
if (id != -1) {
resize_sub_bvhs_if_needed(id);
bvh = sub_bvhs[id].get();
}
}
return bvh;
}
void BVHMulti::set_device_bvh(const Device *subdevice, BVH *bvh)