diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-21 00:31:13 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-24 02:03:59 +0300 |
| commit | 7ad9333fad25b9a7cabea0d659eaf724f89912c8 (patch) | |
| tree | 4fa0d78c9659dd842852420bd1d8b8f8925a0c2f /intern/cycles/kernel/kernels | |
| parent | ae41f38f78f8c54f92cf34dd88e35948e19aed55 (diff) | |
Code refactor: store device/interp/extension/type in each device_memory.
Diffstat (limited to 'intern/cycles/kernel/kernels')
| -rw-r--r-- | intern/cycles/kernel/kernels/cpu/kernel.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/intern/cycles/kernel/kernels/cpu/kernel.cpp b/intern/cycles/kernel/kernels/cpu/kernel.cpp index 7679ab4f111..0ea5b1999aa 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel.cpp +++ b/intern/cycles/kernel/kernels/cpu/kernel.cpp @@ -75,11 +75,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, - size_t width, - size_t height, - size_t depth, - InterpolationType interpolation, - ExtensionType extension) + size_t size) { if(0) { } @@ -87,7 +83,7 @@ void kernel_tex_copy(KernelGlobals *kg, #define KERNEL_TEX(type, tname) \ else if(strcmp(name, #tname) == 0) { \ kg->tname.data = (type*)mem; \ - kg->tname.width = width; \ + kg->tname.width = size; \ } #define KERNEL_IMAGE_TEX(type, tname) #include "kernel/kernel_textures.h" |