blender
/
blender
134
421
Fork 604
Code Issues 6.4k Pull Requests 766 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 +28 -19
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 665a0e84b2 - Show all commits

45
intern/cycles/scene/geometry.cpp
View File

@ -1268,6 +1268,8 @@ void GeometryManager::deviceDataXferAndBVHUpdate(int idx,
AttributeSizes &attrib_sizes, AttributeSizes &attrib_sizes,
const BVHLayout bvh_layout, const BVHLayout bvh_layout,
size_t num_bvh, size_t num_bvh,
bool can_refit,
bool need_update_scene_bvh,
Progress &progress) Progress &progress)
{ {
DeviceScene *sub_dscene = scene->dscenes[idx]; DeviceScene *sub_dscene = scene->dscenes[idx];
@ -1319,6 +1321,16 @@ void GeometryManager::deviceDataXferAndBVHUpdate(int idx,
} }
} }
} }
if(need_update_scene_bvh) {
SCOPED_MARKER(sub_device, "Build Scene BVH");
scoped_callback_timer timer([scene, idx](double time) {
if (scene->update_stats) {
scene->scene_bvh_times[idx] = time;
}
});
device_update_bvh(sub_device, sub_dscene, scene, can_refit, 1, 1, progress);
}
} }
/* /*
@ -1540,10 +1552,10 @@ void GeometryManager::device_update(Device *device,
dscene->data.bvh.bvh_layout = bvh_layout; dscene->data.bvh.bvh_layout = bvh_layout;
size_t num_bvh = createObjectBVHs(device, dscene, scene, bvh_layout, need_update_scene_bvh); size_t num_bvh = createObjectBVHs(device, dscene, scene, bvh_layout, need_update_scene_bvh);
bool can_refit; bool can_refit_scene_bvh = true;
{ if(need_update_scene_bvh) {
SCOPED_MARKER(device, "update scene BVH"); SCOPED_MARKER(device, "update scene BVH");
can_refit = device_update_bvh_preprocess(device, dscene, scene, progress); can_refit_scene_bvh = device_update_bvh_preprocess(device, dscene, scene, progress);
} }
{ {
size_t n_scenes = scene->dscenes.size(); size_t n_scenes = scene->dscenes.size();
@ -1561,7 +1573,8 @@ void GeometryManager::device_update(Device *device,
&attrib_sizes, &attrib_sizes,
bvh_layout, bvh_layout,
num_bvh, num_bvh,
can_refit, can_refit_scene_bvh,
need_update_scene_bvh,
&progress](const size_t idx) { &progress](const size_t idx) {
deviceDataXferAndBVHUpdate(idx, deviceDataXferAndBVHUpdate(idx,
scene, scene,
@ -1570,19 +1583,13 @@ void GeometryManager::device_update(Device *device,
attrib_sizes, attrib_sizes,
bvh_layout, bvh_layout,
num_bvh, num_bvh,
progress); can_refit_scene_bvh,
{ need_update_scene_bvh,
DeviceScene *sub_dscene = scene->dscenes[idx]; progress);
Device *sub_device = sub_dscene->tri_verts.device;
SCOPED_MARKER(sub_device, "Build Scene BVH");
scoped_callback_timer timer([scene, idx](double time) {
if (scene->update_stats) {
scene->scene_bvh_times[idx] = time;
}});
device_update_bvh(sub_device, sub_dscene, scene, can_refit, 1, 1, progress);
}
}); // WL: End of parallel data upload and BVH refit/creation }); // WL: End of parallel data upload and BVH refit/creation
if (need_update_scene_bvh) {
device_update_bvh_postprocess(device, dscene, scene, progress);
}
if (scene->update_stats) { if (scene->update_stats) {
double max_mesh_time = 0.0f; double max_mesh_time = 0.0f;
double max_attrib_time = 0.0f; double max_attrib_time = 0.0f;
@ -1605,9 +1612,9 @@ void GeometryManager::device_update(Device *device,
} }
// WL: Build scene BVH // WL: Build scene BVH
if (need_update_scene_bvh) { // if (need_update_scene_bvh) {
updateSceneBVHs(device, dscene, scene, progress); // updateSceneBVHs(device, dscene, scene, progress);
} // WL: End of scene BVH generation // } // WL: End of scene BVH generation
} // WL: End of device update } // WL: End of device update
/* END OF DEVICE SPECIFIC CODE:BELOW THIS POINT IS HOST SIDE CODE /* END OF DEVICE SPECIFIC CODE:BELOW THIS POINT IS HOST SIDE CODE

2
intern/cycles/scene/geometry.h
View File

@ -266,6 +266,8 @@ class GeometryManager {
AttributeSizes &attrib_sizes, AttributeSizes &attrib_sizes,
const BVHLayout bvh_layout, const BVHLayout bvh_layout,
size_t num_bvh, size_t num_bvh,
bool can_refit,
bool need_update_scene_bvh,
Progress &progress); Progress &progress);
void updateObjectBounds(Scene *scene); void updateObjectBounds(Scene *scene);
void tesselate(Scene *scene, size_t total_tess_needed, Progress &progress); void tesselate(Scene *scene, size_t total_tess_needed, Progress &progress);