blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 771 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 +1 -6
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4ba4f7bf65 - Show all commits

2
intern/cycles/bvh/bvh2.h
View File

@ -33,7 +33,7 @@ struct BVHStackEntry {
*/
class BVH2 : public BVH {
public:
/* The BVH2 needs to be build only once these
/* The BVH2 needs to be built only once these
are used to ensure that it the case. */
thread_mutex build_mutex;
thread_condition_variable build_cv;

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

@ -102,14 +102,11 @@ void GeometryManager::device_update_bvh_postprocess(Device *device,
const bool has_bvh2_layout = (bvh->params.bvh_layout == BVH_LAYOUT_BVH2);
//PackedBVH pack;
if (has_bvh2_layout) {
BVH2 *bvh2 = static_cast<BVH2 *>(scene->bvh);
//pack = std::move(static_cast<BVH2 *>(bvh)->pack);
dscene->data.bvh.root = bvh2->pack.root_index;
}
else {
//pack.root_index = -1;
dscene->data.bvh.root = -1;
}
@ -186,8 +183,6 @@ void GeometryManager::device_update_sub_bvh(Device *device,
// Don't redo the setup if this is not a sub-bvh
if (sub_bvh != bvh) {
sub_bvh->replace_geometry(bvh->geometry, bvh->objects);
// sub_bvh->geometry = bvh->geometry;
// sub_bvh->objects = bvh->objects;
}
}
else {