blender
/
blender
137
415
Fork 598
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 +14 -15
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8ba98b8138 - Show all commits

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

@ -1150,21 +1150,21 @@ bool GeometryManager::displacement_and_curve_shadow_transparency(
sub_dscene->device_update_attributes(sub_device, &(scene->attrib_sizes), progress);
sub_dscene->device_update_mesh(sub_device, &(scene->geom_sizes), progress);
}
/* Copy constant data needed by shader evaluation. */
sub_device->const_copy_to("data", &sub_dscene->data, sizeof(sub_dscene->data));
/* Copy constant data needed by shader evaluation. */
sub_device->const_copy_to("data", &dscene->data, sizeof(dscene->data));
/* Update images needed for true displacement. */
if (true_displacement_used) {
scoped_callback_timer timer([scene](double time) {
if (scene->update_stats) {
scene->update_stats->geometry.times.add_entry(
{"device_update (displacement: load images)", time});
}
});
device_update_displacement_images(sub_device, scene, progress);
}
foreach (Geometry *geom, scene->geometry) {
/* Update images needed for true displacement. */
if(true_displacement_used){
scoped_callback_timer timer([scene](double time) {
if (scene->update_stats) {
scene->update_stats->geometry.times.add_entry(
{"device_update (displacement: load images)", time});
}
});
device_update_displacement_images(sub_device, scene, progress);
}
if (geom->is_modified()) {
if (geom->is_mesh()) {
Mesh *mesh = static_cast<Mesh *>(geom);
@ -1197,8 +1197,7 @@ bool GeometryManager::displacement_and_curve_shadow_transparency(
/* Need to redo host side filling out the attribute and mesh buffers as these may have
changed. Hair adds a new attribute buffer and displace updates the mesh. */
geom_calc_offset(scene);
gather_attributes(
scene, geom_attributes, object_attributes, object_attribute_values);
gather_attributes(scene, geom_attributes, object_attributes, object_attribute_values);
device_free(device, dscene, false);
device_update_attributes_preprocess(device,
dscene,