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/kernel/kernels/cpu/kernel.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/kernel/kernels/cpu/kernel.cpp')
| -rw-r--r-- | intern/cycles/kernel/kernels/cpu/kernel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernels/cpu/kernel.cpp b/intern/cycles/kernel/kernels/cpu/kernel.cpp index 2dbd9e62ee7..2c8d3503c1a 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel.cpp +++ b/intern/cycles/kernel/kernels/cpu/kernel.cpp @@ -45,7 +45,7 @@ void kernel_tex_copy(KernelGlobals *kg, size_t height, size_t depth, InterpolationType interpolation, - bool periodic) + ExtensionType extension) { if(0) { } @@ -71,7 +71,7 @@ void kernel_tex_copy(KernelGlobals *kg, tex->data = (float4*)mem; tex->dimensions_set(width, height, depth); tex->interpolation = interpolation; - tex->periodic = periodic; + tex->extension = extension; } } else if(strstr(name, "__tex_image")) { @@ -87,7 +87,7 @@ void kernel_tex_copy(KernelGlobals *kg, tex->data = (uchar4*)mem; tex->dimensions_set(width, height, depth); tex->interpolation = interpolation; - tex->periodic = periodic; + tex->extension = extension; } } else |