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

4
intern/cycles/device/oneapi/device_impl.cpp
View File

@ -135,7 +135,7 @@ BVHLayoutMask OneapiDevice::get_bvh_layout_mask(uint requested_features) const
}
# ifdef WITH_EMBREE_GPU
void OneapiDevice::build_bvh(BVH *bvh, Progress &progress, bool refit)
void OneapiDevice::build_bvh(BVH *bvh, DeviceScene *dscene, Progress &progress, bool refit)
{
if (embree_device && bvh->params.bvh_layout == BVH_LAYOUT_EMBREE) {
BVHEmbree *const bvh_embree = static_cast<BVHEmbree *>(bvh);
@ -150,7 +150,7 @@ void OneapiDevice::build_bvh(BVH *bvh, Progress &progress, bool refit)
}
}
else {
Device::build_bvh(bvh, progress, refit);
Device::build_bvh(bvh, dscene, progress, refit);
}
}
# endif

2
intern/cycles/device/oneapi/device_impl.h
View File

@ -45,7 +45,7 @@ class OneapiDevice : public Device {
virtual ~OneapiDevice();
# ifdef WITH_EMBREE_GPU
void build_bvh(BVH *bvh, Progress &progress, bool refit) override;
void build_bvh(BVH *bvh, DeviceScene *dscene, Progress &progress, bool refit) override;
# endif
bool check_peer_access(Device *peer_device) override;