diff options
| -rw-r--r-- | libclc/generic/include/clc/clc.h | 1 | ||||
| -rw-r--r-- | libclc/generic/include/clc/math/mix.h | 2 | ||||
| -rw-r--r-- | libclc/generic/include/clc/math/mix.inc | 5 | ||||
| -rw-r--r-- | libclc/generic/lib/SOURCES | 1 | ||||
| -rw-r--r-- | libclc/generic/lib/math/mix.cl | 8 | ||||
| -rw-r--r-- | libclc/generic/lib/math/mix.inc | 9 |
6 files changed, 26 insertions, 0 deletions
diff --git a/libclc/generic/include/clc/clc.h b/libclc/generic/include/clc/clc.h index 416d431b2cc..e0cae98e70d 100644 --- a/libclc/generic/include/clc/clc.h +++ b/libclc/generic/include/clc/clc.h @@ -45,6 +45,7 @@ #include <clc/math/log.h> #include <clc/math/log2.h> #include <clc/math/mad.h> +#include <clc/math/mix.h> #include <clc/math/nextafter.h> #include <clc/math/pow.h> #include <clc/math/rint.h> diff --git a/libclc/generic/include/clc/math/mix.h b/libclc/generic/include/clc/math/mix.h new file mode 100644 index 00000000000..c3c95c1f0c4 --- /dev/null +++ b/libclc/generic/include/clc/math/mix.h @@ -0,0 +1,2 @@ +#define __CLC_BODY <clc/math/mix.inc> +#include <clc/math/gentype.inc> diff --git a/libclc/generic/include/clc/math/mix.inc b/libclc/generic/include/clc/math/mix.inc new file mode 100644 index 00000000000..52cb10ad902 --- /dev/null +++ b/libclc/generic/include/clc/math/mix.inc @@ -0,0 +1,5 @@ +_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE mix(__CLC_GENTYPE a, __CLC_GENTYPE b, __CLC_GENTYPE c); + +#ifndef __CLC_SCALAR +_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE mix(__CLC_GENTYPE a, __CLC_GENTYPE b, __CLC_SCALAR_GENTYPE c); +#endif diff --git a/libclc/generic/lib/SOURCES b/libclc/generic/lib/SOURCES index ccab45a5872..02894d968a0 100644 --- a/libclc/generic/lib/SOURCES +++ b/libclc/generic/lib/SOURCES @@ -32,6 +32,7 @@ math/fmax.cl math/fmin.cl math/hypot.cl math/mad.cl +math/mix.cl math/clc_nextafter.cl math/nextafter.cl math/sincos.cl diff --git a/libclc/generic/lib/math/mix.cl b/libclc/generic/lib/math/mix.cl new file mode 100644 index 00000000000..294f332e67f --- /dev/null +++ b/libclc/generic/lib/math/mix.cl @@ -0,0 +1,8 @@ +#include <clc/clc.h> + +#ifdef cl_khr_fp64 +#pragma OPENCL EXTENSION cl_khr_fp64 : enable +#endif + +#define __CLC_BODY <mix.inc> +#include <clc/math/gentype.inc> diff --git a/libclc/generic/lib/math/mix.inc b/libclc/generic/lib/math/mix.inc new file mode 100644 index 00000000000..1e8b936149b --- /dev/null +++ b/libclc/generic/lib/math/mix.inc @@ -0,0 +1,9 @@ +_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE mix(__CLC_GENTYPE x, __CLC_GENTYPE y, __CLC_GENTYPE a) { + return mad( y - x, a, x ); +} + +#ifndef __CLC_SCALAR +_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE mix(__CLC_GENTYPE x, __CLC_GENTYPE y, __CLC_SCALAR_GENTYPE a) { + return mix(x, y, (__CLC_GENTYPE)a); +} +#endif |
