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 -19
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0f1e29912c - Show all commits

20
intern/cycles/device/memory.h
View File

@ -376,24 +376,6 @@ template<typename T> class device_vector : public device_memory {
assert(data_elements > 0);
}
device_vector(Device *device,
const char *name,
void *p_mem,
size_t width,
size_t height,
size_t depth,
MemoryType type)
: device_memory(device, name, type)
{
data_type = device_type_traits<T>::data_type;
data_elements = device_type_traits<T>::num_elements;
modified = true;
need_realloc_ = true;
assign_mem(p_mem, width, height, depth);
assert(data_elements > 0);
}
virtual ~device_vector()
{
free();
@ -446,7 +428,7 @@ template<typename T> class device_vector : public device_memory {
T *alloc(size_t width, size_t height = 0, size_t depth = 0)
{
size_t new_size = size(width, height, depth);
if (new_size > data_size) {
if (new_size != data_size) {
device_free();
host_free();
host_pointer = host_alloc(sizeof(T) * new_size);