blender
/
blender
136
407
Fork 589
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 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a4b3b8e1fe - Show all commits

2
intern/cycles/device/multi/device.cpp
View File

@ -244,7 +244,7 @@ class MultiDevice : public Device {
if (!bvh_multi->sub_bvhs[id]) {
BVHParams params = bvh_multi->params;
params.bvh_layout = get_bvh_layout(sub->device, bvh_multi->params.bvh_layout);
params.bvh_layout = get_bvh_layout(sub->device.get(), bvh_multi->params.bvh_layout);
/* Skip building a bottom level acceleration structure for non-instanced geometry on
* Embree (since they are put into the top level directly, see bvh_embree.cpp) */

2
intern/cycles/scene/geometry_bvh.cpp
View File

@ -174,7 +174,7 @@ void GeometryManager::device_update_sub_bvh(Device *device,
// Yes, so setup the device specific sub_bvh in the multi-bvh.
BVHParams bparams = bvh->params;
// Set the layout to the correct one for the device
bparams.bvh_layout = device->get_bvh(device, bvh->params.bvh_layout);
bparams.bvh_layout = device->get_bvh_layout(device, bvh->params.bvh_layout);
if (sub_bvh != NULL) {
delete sub_bvh;
}