leesonw/blender-cluster
0
0
Fork 0
forked from blender/blender
Code Pull Requests 2 Activity

Merge latest distributed renderering changes from GHE master-cluster into master-cluster on blender.org #1

Merged
William Leeson merged 13 commits from master-cluster_sync_from_ghe_patch into master-cluster 2023-03-31 17:26:02 +02:00
Conversation 0 Commits 13 Files Changed 77 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f196973a81 - Show all commits

2
intern/cycles/device/cuda/device_impl.h
View File

@ -73,7 +73,7 @@ class CUDADevice : public GPUDevice {
virtual void copy_host_to_device(void *device_pointer, void *host_pointer, size_t size, size_t offset) override; virtual void copy_host_to_device(void *device_pointer, void *host_pointer, size_t size, size_t offset) override;
void host_mem_alloc(size_t size, int aligment, void **p_mem) override; void host_mem_alloc(size_t size, int aligment, void **p_mem) override;
void host_mem_free(void *p_mem) override; void host_mem_free(void *p_mem) override;
void mem_alloc(device_memory &mem) override; void mem_alloc(device_memory &mem) override;
void mem_copy_to(device_memory &mem) override; void mem_copy_to(device_memory &mem) override;