diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-05 02:34:30 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-05 17:22:04 +0300 |
commit | 5801ef71e40bc932c69e67f06076cd8b41132e52 (patch) | |
tree | 1fec0c65b9ead5720f54229497060af1f0194bbb /intern/cycles/kernel/kernels/cpu | |
parent | 5475314f4955dbc3af305577a26fe0b537380313 (diff) |
Code refactor: device memory cleanups, preparing for mapped host memory.
Diffstat (limited to 'intern/cycles/kernel/kernels/cpu')
-rw-r--r-- | intern/cycles/kernel/kernels/cpu/kernel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernels/cpu/kernel.cpp b/intern/cycles/kernel/kernels/cpu/kernel.cpp index 0ea5b1999aa..aa67262f36b 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel.cpp +++ b/intern/cycles/kernel/kernels/cpu/kernel.cpp @@ -74,7 +74,7 @@ void kernel_const_copy(KernelGlobals *kg, const char *name, void *host, size_t s void kernel_tex_copy(KernelGlobals *kg, const char *name, - device_ptr mem, + void *mem, size_t size) { if(0) { |