diff options
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/device/cpu/image.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/intern/cycles/kernel/device/cpu/image.h b/intern/cycles/kernel/device/cpu/image.h index 94eeaed7698..ebddc1989bd 100644 --- a/intern/cycles/kernel/device/cpu/image.h +++ b/intern/cycles/kernel/device/cpu/image.h @@ -31,18 +31,19 @@ ccl_device_inline float frac(float x, int *ix) return x - (float)i; } -template<typename TexT, typename OutT = float4> struct TextureInterpolator { - template<typename ZeroT> static ccl_always_inline ZeroT zero(); +template<typename ZeroT> ccl_always_inline ZeroT zero(); - template<> static ccl_always_inline float zero() - { - return 0.0f; - } +template<> ccl_always_inline float zero<float>() +{ + return 0.0f; +} - template<> static ccl_always_inline float4 zero() - { - return zero_float4(); - } +template<> ccl_always_inline float4 zero<float4>() +{ + return zero_float4(); +} + +template<typename TexT, typename OutT = float4> struct TextureInterpolator { static ccl_always_inline float4 read(float4 r) { |