diff options
Diffstat (limited to 'intern/cycles/util/math_float3.h')
| -rw-r--r-- | intern/cycles/util/math_float3.h | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/intern/cycles/util/math_float3.h b/intern/cycles/util/math_float3.h index 365c322dd7e..c02b4cdbf0d 100644 --- a/intern/cycles/util/math_float3.h +++ b/intern/cycles/util/math_float3.h @@ -53,26 +53,25 @@ ccl_device_inline float3 ceil(const float3 &a); ccl_device_inline float3 reflect(const float3 incident, const float3 normal); #endif /* !defined(__KERNEL_METAL__) */ -ccl_device_inline float min3(float3 a); -ccl_device_inline float max3(float3 a); +ccl_device_inline float reduce_min(float3 a); +ccl_device_inline float reduce_max(float3 a); ccl_device_inline float len(const float3 a); ccl_device_inline float len_squared(const float3 a); ccl_device_inline float3 project(const float3 v, const float3 v_proj); -ccl_device_inline float3 saturate3(float3 a); ccl_device_inline float3 safe_normalize(const float3 a); ccl_device_inline float3 normalize_len(const float3 a, ccl_private float *t); ccl_device_inline float3 safe_normalize_len(const float3 a, ccl_private float *t); -ccl_device_inline float3 safe_divide_float3_float3(const float3 a, const float3 b); -ccl_device_inline float3 safe_divide_float3_float(const float3 a, const float b); +ccl_device_inline float3 safe_divide(const float3 a, const float3 b); +ccl_device_inline float3 safe_divide(const float3 a, const float b); ccl_device_inline float3 interp(float3 a, float3 b, float t); -ccl_device_inline float3 sqr3(float3 a); +ccl_device_inline float3 sqr(float3 a); ccl_device_inline bool is_zero(const float3 a); ccl_device_inline float reduce_add(const float3 a); ccl_device_inline float average(const float3 a); -ccl_device_inline bool isequal_float3(const float3 a, const float3 b); +ccl_device_inline bool isequal(const float3 a, const float3 b); /******************************************************************************* * Definition. @@ -377,14 +376,30 @@ ccl_device_inline float3 rcp(const float3 &a) return make_float3(1.0f / a.x, 1.0f / a.y, 1.0f / a.z); # endif } + +ccl_device_inline float3 saturate(float3 a) +{ + return make_float3(saturatef(a.x), saturatef(a.y), saturatef(a.z)); +} + +ccl_device_inline float3 exp(float3 v) +{ + return make_float3(expf(v.x), expf(v.y), expf(v.z)); +} + +ccl_device_inline float3 log(float3 v) +{ + return make_float3(logf(v.x), logf(v.y), logf(v.z)); +} + #endif /* !__KERNEL_METAL__ */ -ccl_device_inline float min3(float3 a) +ccl_device_inline float reduce_min(float3 a) { return min(min(a.x, a.y), a.z); } -ccl_device_inline float max3(float3 a) +ccl_device_inline float reduce_max(float3 a) { return max(max(a.x, a.y), a.z); } @@ -433,11 +448,6 @@ ccl_device_inline float3 project(const float3 v, const float3 v_proj) return (len_squared != 0.0f) ? (dot(v, v_proj) / len_squared) * v_proj : zero_float3(); } -ccl_device_inline float3 saturate3(float3 a) -{ - return make_float3(saturatef(a.x), saturatef(a.y), saturatef(a.z)); -} - ccl_device_inline float3 normalize_len(const float3 a, ccl_private float *t) { *t = len(a); @@ -457,14 +467,14 @@ ccl_device_inline float3 safe_normalize_len(const float3 a, ccl_private float *t return (*t != 0.0f) ? a / (*t) : a; } -ccl_device_inline float3 safe_divide_float3_float3(const float3 a, const float3 b) +ccl_device_inline float3 safe_divide(const float3 a, const float3 b) { return make_float3((b.x != 0.0f) ? a.x / b.x : 0.0f, (b.y != 0.0f) ? a.y / b.y : 0.0f, (b.z != 0.0f) ? a.z / b.z : 0.0f); } -ccl_device_inline float3 safe_divide_float3_float(const float3 a, const float b) +ccl_device_inline float3 safe_divide(const float3 a, const float b) { return (b != 0.0f) ? a / b : zero_float3(); } @@ -474,7 +484,7 @@ ccl_device_inline float3 interp(float3 a, float3 b, float t) return a + t * (b - a); } -ccl_device_inline float3 sqr3(float3 a) +ccl_device_inline float3 sqr(float3 a) { return a * a; } @@ -504,7 +514,7 @@ ccl_device_inline float average(const float3 a) return reduce_add(a) * (1.0f / 3.0f); } -ccl_device_inline bool isequal_float3(const float3 a, const float3 b) +ccl_device_inline bool isequal(const float3 a, const float3 b) { #if defined(__KERNEL_METAL__) return all(a == b); @@ -513,21 +523,11 @@ ccl_device_inline bool isequal_float3(const float3 a, const float3 b) #endif } -ccl_device_inline float3 pow3(float3 v, float e) +ccl_device_inline float3 pow(float3 v, float e) { return make_float3(powf(v.x, e), powf(v.y, e), powf(v.z, e)); } -ccl_device_inline float3 exp3(float3 v) -{ - return make_float3(expf(v.x), expf(v.y), expf(v.z)); -} - -ccl_device_inline float3 log3(float3 v) -{ - return make_float3(logf(v.x), logf(v.y), logf(v.z)); -} - ccl_device_inline int3 quick_floor_to_int3(const float3 a) { #ifdef __KERNEL_SSE__ @@ -540,12 +540,12 @@ ccl_device_inline int3 quick_floor_to_int3(const float3 a) #endif } -ccl_device_inline bool isfinite3_safe(float3 v) +ccl_device_inline bool isfinite_safe(float3 v) { return isfinite_safe(v.x) && isfinite_safe(v.y) && isfinite_safe(v.z); } -ccl_device_inline float3 ensure_finite3(float3 v) +ccl_device_inline float3 ensure_finite(float3 v) { if (!isfinite_safe(v.x)) v.x = 0.0f; |