diff options
Diffstat (limited to 'intern/cycles/util/util_math.h')
-rw-r--r-- | intern/cycles/util/util_math.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h index 045fb5c6fa0..019dede07fa 100644 --- a/intern/cycles/util/util_math.h +++ b/intern/cycles/util/util_math.h @@ -38,6 +38,8 @@ CCL_NAMESPACE_BEGIN +/* Float Pi variations */ + #ifndef M_PI_F #define M_PI_F ((float)3.14159265358979323846264338327950288) #endif @@ -69,6 +71,8 @@ CCL_NAMESPACE_BEGIN #endif +#ifndef __KERNEL_OPENCL__ + __device_inline float fmaxf(float a, float b) { return (a > b)? a: b; @@ -81,6 +85,8 @@ __device_inline float fminf(float a, float b) #endif +#endif + #ifndef __KERNEL_GPU__ __device_inline int max(int a, int b) |