blender
/
blender
137
415
Fork 598
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
3 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 4ca1060431 - Show all commits

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

@ -67,7 +67,7 @@ DeviceScene::DeviceScene(Device *device)
memset((void *)&data, 0, sizeof(data));
}
void DeviceScene::device_free(bool force_free)
void DeviceScene::device_free_geometry(bool force_free)
{
bvh_nodes.free_if_need_realloc(force_free);
bvh_leaf_nodes.free_if_need_realloc(force_free);

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

@ -104,7 +104,7 @@ class DeviceScene {
DeviceScene(Device *device);
void device_free(bool force_free);
void device_free_geometry(bool force_free);
void device_scene_clear_modified();
void device_update_host_pointers(Device *device,
DeviceScene *dscene,

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

@ -948,7 +948,7 @@ void GeometryManager::device_update(Device *device,
void GeometryManager::device_free(Device *device, DeviceScene *dscene, bool force_free)
{
dscene->device_free(force_free);
dscene->device_free_geometry(force_free);
#ifdef WITH_OSL
OSLGlobals *og = (OSLGlobals *)device->get_cpu_osl_memory();