diff options
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_math_float2.h | 6 | ||||
| -rw-r--r-- | intern/cycles/util/util_param.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/intern/cycles/util/util_math_float2.h b/intern/cycles/util/util_math_float2.h index e937509367f..6fe8e3b4115 100644 --- a/intern/cycles/util/util_math_float2.h +++ b/intern/cycles/util/util_math_float2.h @@ -220,6 +220,12 @@ ccl_device_inline float2 interp(const float2& a, const float2& b, float t) { return a + t*(b - a); } + +ccl_device_inline float2 mix(const float2& a, const float2& b, float t) +{ + return a + t*(b - a); +} + #endif /* !__KERNEL_OPENCL__ */ CCL_NAMESPACE_END diff --git a/intern/cycles/util/util_param.h b/intern/cycles/util/util_param.h index 4453c66aae2..03815486429 100644 --- a/intern/cycles/util/util_param.h +++ b/intern/cycles/util/util_param.h @@ -28,6 +28,8 @@ CCL_NAMESPACE_BEGIN OIIO_NAMESPACE_USING +static constexpr TypeDesc TypeFloat2(TypeDesc::FLOAT, TypeDesc::VEC2); + CCL_NAMESPACE_END #endif /* __UTIL_PARAM_H__ */ |