diff options
Diffstat (limited to 'libclc')
| -rw-r--r-- | libclc/generic/lib/math/maxmag.cl | 1 | ||||
| -rw-r--r-- | libclc/generic/lib/math/maxmag.inc | 22 |
2 files changed, 21 insertions, 2 deletions
diff --git a/libclc/generic/lib/math/maxmag.cl b/libclc/generic/lib/math/maxmag.cl index db23fc0f629..7b5902d8a8e 100644 --- a/libclc/generic/lib/math/maxmag.cl +++ b/libclc/generic/lib/math/maxmag.cl @@ -1,4 +1,5 @@ #include <clc/clc.h> +#include <utils.h> #define __CLC_BODY <maxmag.inc> #include <clc/math/gentype.inc> diff --git a/libclc/generic/lib/math/maxmag.inc b/libclc/generic/lib/math/maxmag.inc index 88b0129835b..226316ab398 100644 --- a/libclc/generic/lib/math/maxmag.inc +++ b/libclc/generic/lib/math/maxmag.inc @@ -1,4 +1,22 @@ +#ifdef __CLC_SCALAR +#define __CLC_VECSIZE +#endif + +#if __CLC_FPSIZE == 64 +#define __CLC_CONVERT_NATN __CLC_XCONCAT(convert_long, __CLC_VECSIZE) +#elif __CLC_FPSIZE == 32 +#define __CLC_CONVERT_NATN __CLC_XCONCAT(convert_int, __CLC_VECSIZE) +#elif __CLC_FPSIZE == 16 +#define __CLC_CONVERT_NATN __CLC_XCONCAT(convert_short, __CLC_VECSIZE) +#endif + _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE maxmag(__CLC_GENTYPE x, __CLC_GENTYPE y) { - const __CLC_GENTYPE res = select(y, x, isgreater(fabs(x), fabs(y))); - return select(res, fmax(x, y), isnan(x) | isnan(y) | isequal(fabs(x), fabs(y))); + const __CLC_GENTYPE res = select(y, x, __CLC_CONVERT_NATN(isgreater(fabs(x), fabs(y)))); + return select(res, fmax(x, y), __CLC_CONVERT_NATN(isnan(x) | isnan(y) | isequal(fabs(x), fabs(y)))); } + +#undef __CLC_CONVERT_NATN + +#ifdef __CLC_SCALAR +#undef __CLC_VECSIZE +#endif |
