Cycles: correct math wrappers
include the parens around value before cast, in some cases was causing double/float promotion by only casting the left value.
This commit is contained in:
parent
9245e1aeb8
commit
e2522b4a29
@ -29,7 +29,7 @@
|
||||
* double precision version, even with float<->double conversion involved.
|
||||
*/
|
||||
#if !defined(__KERNEL_GPU__) && defined(__linux__) && defined(__x86_64__)
|
||||
# define expf(x) ((float)exp((double)x))
|
||||
# define expf(x) ((float)exp((double)(x)))
|
||||
#endif
|
||||
|
||||
CCL_NAMESPACE_BEGIN
|
||||
|
@ -75,12 +75,11 @@ typedef texture<uchar4, 2, cudaReadModeNormalizedFloat> texture_image_uchar4;
|
||||
|
||||
/* Use fast math functions */
|
||||
|
||||
#define cosf(x) __cosf(((float)x))
|
||||
#define sinf(x) __sinf(((float)x))
|
||||
#define powf(x, y) __powf(((float)x), ((float)y))
|
||||
#define tanf(x) __tanf(((float)x))
|
||||
#define logf(x) __logf(((float)x))
|
||||
#define expf(x) __expf(((float)x))
|
||||
#define cosf(x) __cosf(((float)(x)))
|
||||
#define sinf(x) __sinf(((float)(x)))
|
||||
#define powf(x, y) __powf(((float)(x)), ((float)(y)))
|
||||
#define tanf(x) __tanf(((float)(x)))
|
||||
#define logf(x) __logf(((float)(x)))
|
||||
#define expf(x) __expf(((float)(x)))
|
||||
|
||||
#endif /* __KERNEL_COMPAT_CUDA_H__ */
|
||||
|
||||
|
@ -77,34 +77,34 @@
|
||||
#define __float_as_uint(x) as_uint(x)
|
||||
#define __int_as_float(x) as_float(x)
|
||||
#define __float_as_int(x) as_int(x)
|
||||
#define powf(x, y) pow(((float)x), ((float)y))
|
||||
#define fabsf(x) fabs(((float)x))
|
||||
#define copysignf(x, y) copysign(((float)x), ((float)y))
|
||||
#define asinf(x) asin(((float)x))
|
||||
#define acosf(x) acos(((float)x))
|
||||
#define atanf(x) atan(((float)x))
|
||||
#define floorf(x) floor(((float)x))
|
||||
#define ceilf(x) ceil(((float)x))
|
||||
#define hypotf(x, y) hypot(((float)x), ((float)y))
|
||||
#define atan2f(x, y) atan2(((float)x), ((float)y))
|
||||
#define fmaxf(x, y) fmax(((float)x), ((float)y))
|
||||
#define fminf(x, y) fmin(((float)x), ((float)y))
|
||||
#define fmodf(x, y) fmod((float)x, (float)y)
|
||||
#define powf(x, y) pow(((float)(x)), ((float)(y)))
|
||||
#define fabsf(x) fabs(((float)(x)))
|
||||
#define copysignf(x, y) copysign(((float)(x)), ((float)(y)))
|
||||
#define asinf(x) asin(((float)(x)))
|
||||
#define acosf(x) acos(((float)(x)))
|
||||
#define atanf(x) atan(((float)(x)))
|
||||
#define floorf(x) floor(((float)(x)))
|
||||
#define ceilf(x) ceil(((float)(x)))
|
||||
#define hypotf(x, y) hypot(((float)(x)), ((float)(y)))
|
||||
#define atan2f(x, y) atan2(((float)(x)), ((float)(y)))
|
||||
#define fmaxf(x, y) fmax(((float)(x)), ((float)(y)))
|
||||
#define fminf(x, y) fmin(((float)(x)), ((float)(y)))
|
||||
#define fmodf(x, y) fmod((float)(x), (float)(y))
|
||||
|
||||
#ifndef __CL_USE_NATIVE__
|
||||
#define sinf(x) native_sin(((float)x))
|
||||
#define cosf(x) native_cos(((float)x))
|
||||
#define tanf(x) native_tan(((float)x))
|
||||
#define expf(x) native_exp(((float)x))
|
||||
#define sqrtf(x) native_sqrt(((float)x))
|
||||
#define logf(x) native_log(((float)x))
|
||||
#define sinf(x) native_sin(((float)(x)))
|
||||
#define cosf(x) native_cos(((float)(x)))
|
||||
#define tanf(x) native_tan(((float)(x)))
|
||||
#define expf(x) native_exp(((float)(x)))
|
||||
#define sqrtf(x) native_sqrt(((float)(x)))
|
||||
#define logf(x) native_log(((float)(x)))
|
||||
#else
|
||||
#define sinf(x) sin(((float)x))
|
||||
#define cosf(x) cos(((float)x))
|
||||
#define tanf(x) tan(((float)x))
|
||||
#define expf(x) exp(((float)x))
|
||||
#define sqrtf(x) sqrt(((float)x))
|
||||
#define logf(x) log(((float)x))
|
||||
#define sinf(x) sin(((float)(x)))
|
||||
#define cosf(x) cos(((float)(x)))
|
||||
#define tanf(x) tan(((float)(x)))
|
||||
#define expf(x) exp(((float)(x)))
|
||||
#define sqrtf(x) sqrt(((float)(x)))
|
||||
#define logf(x) log(((float)(x)))
|
||||
#endif
|
||||
|
||||
/* data lookup defines */
|
||||
|
Loading…
Reference in New Issue
Block a user