diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-02-22 15:32:57 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-03-08 08:52:41 +0300 |
| commit | 0f56f7a8118f017fa8a42a4bbfdfb77c9dd55d68 (patch) | |
| tree | 99e0ff98adff854bc19696a0f4153030e952b47e /intern/cycles/device/device_cuda.cpp | |
| parent | 9e566b06e3e10e2a6514ee09354abfe90c538284 (diff) | |
Cycles: Allow device_memory to be used directly
This is useful for when theres no host side memory attched to the buffer
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 5e87f9ec895..1e5ce7875b1 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -505,7 +505,9 @@ public: void mem_zero(device_memory& mem) { - memset((void*)mem.data_pointer, 0, mem.memory_size()); + if(mem.data_pointer) { + memset((void*)mem.data_pointer, 0, mem.memory_size()); + } cuda_push_context(); if(mem.device_pointer) |