diff options
author | Thomas Dinges <blender@dingto.org> | 2016-05-20 17:46:49 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2016-05-20 17:50:29 +0300 |
commit | a5a05fc291ab8e024e3ff6bf9cd63733c7687f86 (patch) | |
tree | 52d2c66c36100138980400e2cfc7e42f80c73b51 /intern/cycles/kernel/kernels/cpu | |
parent | 7ab55d894713fede179df652ba59cc241658dc28 (diff) |
Cycles: Fix long compile time with MSVC.
Compile time per kernel increased alot after recent image commits, re-shuffle some code to fix this.
Patch by "LazyDodo".
Differential Revision: https://developer.blender.org/D2012
Diffstat (limited to 'intern/cycles/kernel/kernels/cpu')
-rw-r--r-- | intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h | 66 | ||||
-rw-r--r-- | intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h | 1 |
2 files changed, 67 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h b/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h new file mode 100644 index 00000000000..4807f96a0df --- /dev/null +++ b/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h @@ -0,0 +1,66 @@ +/* + * Copyright 2011-2016 Blender Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __KERNEL_CPU_IMAGE_H__ +#define __KERNEL_CPU_IMAGE_H__ + +#ifdef __KERNEL_CPU__ + +CCL_NAMESPACE_BEGIN + +ccl_device float4 kernel_tex_image_interp_impl(KernelGlobals *kg, int tex, float x, float y) +{ + if(tex >= TEX_IMAGE_BYTE_START_CPU) + return kg->texture_byte_images[tex - TEX_IMAGE_BYTE_START_CPU].interp(x, y); + else if(tex >= TEX_IMAGE_FLOAT_START_CPU) + return kg->texture_float_images[tex - TEX_IMAGE_FLOAT_START_CPU].interp(x, y); + else if(tex >= TEX_IMAGE_BYTE4_START_CPU) + return kg->texture_byte4_images[tex - TEX_IMAGE_BYTE4_START_CPU].interp(x, y); + else + return kg->texture_float4_images[tex].interp(x, y); +} + +ccl_device float4 kernel_tex_image_interp_3d_impl(KernelGlobals *kg, int tex, float x, float y, float z) +{ + if(tex >= TEX_IMAGE_BYTE_START_CPU) + return kg->texture_byte_images[tex - TEX_IMAGE_BYTE_START_CPU].interp_3d(x, y, z); + else if(tex >= TEX_IMAGE_FLOAT_START_CPU) + return kg->texture_float_images[tex - TEX_IMAGE_FLOAT_START_CPU].interp_3d(x, y, z); + else if(tex >= TEX_IMAGE_BYTE4_START_CPU) + return kg->texture_byte4_images[tex - TEX_IMAGE_BYTE4_START_CPU].interp_3d(x, y, z); + else + return kg->texture_float4_images[tex].interp_3d(x, y, z); + +} + +ccl_device float4 kernel_tex_image_interp_3d_ex_impl(KernelGlobals *kg, int tex, float x, float y, float z, int interpolation) +{ + if(tex >= TEX_IMAGE_BYTE_START_CPU) + return kg->texture_byte_images[tex - TEX_IMAGE_BYTE_START_CPU].interp_3d_ex(x, y, z, interpolation); + else if(tex >= TEX_IMAGE_FLOAT_START_CPU) + return kg->texture_float_images[tex - TEX_IMAGE_FLOAT_START_CPU].interp_3d_ex(x, y, z, interpolation); + else if(tex >= TEX_IMAGE_BYTE4_START_CPU) + return kg->texture_byte4_images[tex - TEX_IMAGE_BYTE4_START_CPU].interp_3d_ex(x, y, z, interpolation); + else + return kg->texture_float4_images[tex].interp_3d_ex(x, y, z, interpolation); +} + +CCL_NAMESPACE_END + +#endif // __KERNEL_CPU__ + + +#endif // __KERNEL_CPU_IMAGE_H__ diff --git a/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h b/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h index 1454f925ab9..962196ccbdd 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h +++ b/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h @@ -24,6 +24,7 @@ #include "kernel_math.h" #include "kernel_types.h" #include "kernel_globals.h" +#include "kernel_cpu_image.h" #include "kernel_film.h" #include "kernel_path.h" #include "kernel_path_branched.h" |