diff options
Diffstat (limited to 'intern/cycles/util/math_float2.h')
| -rw-r--r-- | intern/cycles/util/math_float2.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/util/math_float2.h b/intern/cycles/util/math_float2.h index d6b47052720..542dad93467 100644 --- a/intern/cycles/util/math_float2.h +++ b/intern/cycles/util/math_float2.h @@ -40,7 +40,7 @@ ccl_device_inline float average(const float2 &a); ccl_device_inline float distance(const float2 &a, const float2 &b); ccl_device_inline float dot(const float2 &a, const float2 &b); ccl_device_inline float cross(const float2 &a, const float2 &b); -ccl_device_inline float len(const float2 &a); +ccl_device_inline float len(const float2 a); ccl_device_inline float2 normalize(const float2 &a); ccl_device_inline float2 normalize_len(const float2 &a, float *t); ccl_device_inline float2 safe_normalize(const float2 &a); @@ -187,11 +187,6 @@ ccl_device_inline float cross(const float2 &a, const float2 &b) return (a.x * b.y - a.y * b.x); } -ccl_device_inline float len(const float2 &a) -{ - return sqrtf(dot(a, a)); -} - ccl_device_inline float2 normalize(const float2 &a) { return a / len(a); @@ -251,6 +246,11 @@ ccl_device_inline float2 floor(const float2 &a) #endif /* !__KERNEL_METAL__ */ +ccl_device_inline float len(const float2 a) +{ + return sqrtf(dot(a, a)); +} + ccl_device_inline float2 safe_divide_float2_float(const float2 a, const float b) { return (b != 0.0f) ? a / b : zero_float2(); |