diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-21 22:58:19 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-21 22:58:19 +0300 |
commit | f2c54df625d65c40f6070294a5f66de3f2d18c10 (patch) | |
tree | 1f5b12ba40e6e9b563d84c9df5ebe47b24ead20e /intern/cycles/device/device_cpu.cpp | |
parent | dc3563ff4801907ec8cd21a1589f0cb56d021a8f (diff) |
Cycles: Expose image image extension mapping to the image manager
Currently only two mappings are supported by API, which is Repeat (old behavior)
and new Clip behavior. Internally this extension is being converted to periodic
flag which was already supported but wasn't exposed.
There's no support for OpenCL yet because of the way how we pack images into a
single texture.
Those settings are not exposed to UI or anywhere else and there should be no
functional changes so far.
Diffstat (limited to 'intern/cycles/device/device_cpu.cpp')
-rw-r--r-- | intern/cycles/device/device_cpu.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp index 013f656e31c..ec82b3805c4 100644 --- a/intern/cycles/device/device_cpu.cpp +++ b/intern/cycles/device/device_cpu.cpp @@ -123,10 +123,20 @@ public: kernel_const_copy(&kernel_globals, name, host, size); } - void tex_alloc(const char *name, device_memory& mem, InterpolationType interpolation, bool /*periodic*/) + void tex_alloc(const char *name, + device_memory& mem, + InterpolationType interpolation, + bool periodic) { VLOG(1) << "Texture allocate: " << name << ", " << mem.memory_size() << " bytes."; - kernel_tex_copy(&kernel_globals, name, mem.data_pointer, mem.data_width, mem.data_height, mem.data_depth, interpolation); + kernel_tex_copy(&kernel_globals, + name, + mem.data_pointer, + mem.data_width, + mem.data_height, + mem.data_depth, + interpolation, + periodic); mem.device_pointer = mem.data_pointer; mem.device_size = mem.memory_size(); stats.mem_alloc(mem.device_size); |