diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-28 14:51:10 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-28 15:14:24 +0300 |
| commit | 3fba620858fa5bf44bec3124c61f6cc2e40356b0 (patch) | |
| tree | 41aaddb8ad9fdd6b964a62b85129a703d626d5f8 /intern/cycles/device/device_cpu.cpp | |
| parent | 29ebb56f4d8b99ca3038c7a3d0ed794ef77ee7f9 (diff) | |
Cycles: Prepare for more image extension types support
Basically just replace boolean periodic flag with extension type enum in the
device API.
Diffstat (limited to 'intern/cycles/device/device_cpu.cpp')
| -rw-r--r-- | intern/cycles/device/device_cpu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp index ec82b3805c4..f06963c146e 100644 --- a/intern/cycles/device/device_cpu.cpp +++ b/intern/cycles/device/device_cpu.cpp @@ -126,7 +126,7 @@ public: void tex_alloc(const char *name, device_memory& mem, InterpolationType interpolation, - bool periodic) + ExtensionType extension) { VLOG(1) << "Texture allocate: " << name << ", " << mem.memory_size() << " bytes."; kernel_tex_copy(&kernel_globals, @@ -136,7 +136,7 @@ public: mem.data_height, mem.data_depth, interpolation, - periodic); + extension); mem.device_pointer = mem.data_pointer; mem.device_size = mem.memory_size(); stats.mem_alloc(mem.device_size); |