Changeset View
Changeset View
Standalone View
Standalone View
intern/cycles/device/device_cpu.cpp
| Show First 20 Lines • Show All 97 Lines • ▼ Show 20 Lines | void mem_free(device_memory& mem) | ||||
| stats.mem_free(mem.memory_size()); | stats.mem_free(mem.memory_size()); | ||||
| } | } | ||||
| void const_copy_to(const char *name, void *host, size_t size) | void const_copy_to(const char *name, void *host, size_t size) | ||||
| { | { | ||||
| kernel_const_copy(&kernel_globals, name, host, size); | kernel_const_copy(&kernel_globals, name, host, size); | ||||
| } | } | ||||
| void tex_alloc(const char *name, device_memory& mem, bool interpolation, bool periodic) | void tex_alloc(const char *name, device_memory& mem, InterpolationType interpolation, bool periodic) | ||||
| { | { | ||||
| kernel_tex_copy(&kernel_globals, name, mem.data_pointer, mem.data_width, mem.data_height); | int interp = interpolation == INTERPOLATION_LINEAR ? 0 : 1; | ||||
| kernel_tex_copy(&kernel_globals, name, mem.data_pointer, mem.data_width, mem.data_height, interp); | |||||
brecht: This should make cubic and smart fallback to linear. | |||||
| mem.device_pointer = mem.data_pointer; | mem.device_pointer = mem.data_pointer; | ||||
| stats.mem_alloc(mem.memory_size()); | stats.mem_alloc(mem.memory_size()); | ||||
| } | } | ||||
| void tex_free(device_memory& mem) | void tex_free(device_memory& mem) | ||||
| { | { | ||||
| mem.device_pointer = 0; | mem.device_pointer = 0; | ||||
| ▲ Show 20 Lines • Show All 376 Lines • Show Last 20 Lines | |||||
This should make cubic and smart fallback to linear.