diff options
Diffstat (limited to 'libclc')
| -rw-r--r-- | libclc/generic/lib/math/minmag.cl | 1 | ||||
| -rw-r--r-- | libclc/generic/lib/math/minmag.inc | 22 |
2 files changed, 21 insertions, 2 deletions
diff --git a/libclc/generic/lib/math/minmag.cl b/libclc/generic/lib/math/minmag.cl index 1c815fc9b0d..0d898820609 100644 --- a/libclc/generic/lib/math/minmag.cl +++ b/libclc/generic/lib/math/minmag.cl @@ -1,4 +1,5 @@ #include <clc/clc.h> +#include <utils.h> #define __CLC_BODY <minmag.inc> #include <clc/math/gentype.inc> diff --git a/libclc/generic/lib/math/minmag.inc b/libclc/generic/lib/math/minmag.inc index 097822c6502..f8072aa326a 100644 --- a/libclc/generic/lib/math/minmag.inc +++ b/libclc/generic/lib/math/minmag.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 minmag(__CLC_GENTYPE x, __CLC_GENTYPE y) { - const __CLC_GENTYPE res = select(y, x, isless(fabs(x), fabs(y))); - return select(res, fmin(x, y), isnan(x) | isnan(y) | isequal(fabs(x), fabs(y))); + const __CLC_GENTYPE res = select(y, x, __CLC_CONVERT_NATN(isless(fabs(x), fabs(y)))); + return select(res, fmin(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 |
