diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-03-12 17:22:18 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-03-12 19:28:55 +0300 |
commit | 26bea849cfa1d020150e0862002d7d5463f07817 (patch) | |
tree | 23bfbc7770dc0352dcc5378a14ffc681f7eb22ee /intern/cycles/kernel/kernels/cpu | |
parent | 75be60a66755f96e6d1d9b7e98bd0836784769f6 (diff) |
Cleanup: add device_texture for images, distinct from other global memory
There was too much image texture specific stuff in device_memory, and too
much code duplication between devices.
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 f2146302a27..8829a14ead5 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel.cpp +++ b/intern/cycles/kernel/kernels/cpu/kernel.cpp @@ -72,7 +72,7 @@ void kernel_const_copy(KernelGlobals *kg, const char *name, void *host, size_t s assert(0); } -void kernel_tex_copy(KernelGlobals *kg, const char *name, void *mem, size_t size) +void kernel_global_memory_copy(KernelGlobals *kg, const char *name, void *mem, size_t size) { if (0) { } |