diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-06-24 18:08:01 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-06-24 18:25:44 +0300 |
| commit | b4e1571d0bcf186df979455cf9852dccd325345b (patch) | |
| tree | d13b72ce1050fc0035b9d682a10531bc4a174fbf /intern/cycles/kernel/kernels | |
| parent | c78b831e69faaa206ca457e80581f6371cad73fa (diff) | |
Cleanup: compiler warnings
Diffstat (limited to 'intern/cycles/kernel/kernels')
| -rw-r--r-- | intern/cycles/kernel/kernels/cpu/kernel.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernels/cpu/kernel.cpp b/intern/cycles/kernel/kernels/cpu/kernel.cpp index 8829a14ead5..8040bfb7b33 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel.cpp +++ b/intern/cycles/kernel/kernels/cpu/kernel.cpp @@ -64,12 +64,14 @@ CCL_NAMESPACE_BEGIN /* Memory Copy */ -void kernel_const_copy(KernelGlobals *kg, const char *name, void *host, size_t size) +void kernel_const_copy(KernelGlobals *kg, const char *name, void *host, size_t) { - if (strcmp(name, "__data") == 0) - memcpy(&kg->__data, host, size); - else + if (strcmp(name, "__data") == 0) { + kg->__data = *(KernelData *)host; + } + else { assert(0); + } } void kernel_global_memory_copy(KernelGlobals *kg, const char *name, void *mem, size_t size) |