diff options
| -rw-r--r-- | generic/include/clc/clc.h | 3 | ||||
| -rw-r--r-- | generic/include/clc/integer/max.h | 2 | ||||
| -rw-r--r-- | generic/include/clc/math/max.h | 2 | ||||
| -rw-r--r-- | generic/include/clc/math/max.inc | 1 | ||||
| -rw-r--r-- | generic/include/clc/shared/max.h | 5 | ||||
| -rw-r--r-- | generic/include/clc/shared/max.inc (renamed from generic/include/clc/integer/max.inc) | 0 | ||||
| -rw-r--r-- | generic/lib/SOURCES | 3 | ||||
| -rw-r--r-- | generic/lib/integer/max.cl | 4 | ||||
| -rw-r--r-- | generic/lib/math/max.inc | 3 | ||||
| -rw-r--r-- | generic/lib/shared/max.cl (renamed from generic/lib/math/max.cl) | 3 | ||||
| -rw-r--r-- | generic/lib/shared/max.inc (renamed from generic/lib/integer/max.inc) | 0 |
11 files changed, 10 insertions, 16 deletions
diff --git a/generic/include/clc/clc.h b/generic/include/clc/clc.h index 80ecd01..c3d7d59 100644 --- a/generic/include/clc/clc.h +++ b/generic/include/clc/clc.h @@ -45,7 +45,6 @@ #include <clc/math/log.h> #include <clc/math/log2.h> #include <clc/math/mad.h> -#include <clc/math/max.h> #include <clc/math/pow.h> #include <clc/math/sin.h> #include <clc/math/sqrt.h> @@ -64,11 +63,11 @@ #include <clc/integer/abs.h> #include <clc/integer/abs_diff.h> #include <clc/integer/add_sat.h> -#include <clc/integer/max.h> #include <clc/integer/sub_sat.h> /* 6.11.2 and 6.11.3 Shared Integer/Math Functions */ #include <clc/shared/clamp.h> +#include <clc/shared/max.h> /* 6.11.5 Geometric Functions */ #include <clc/geometric/cross.h> diff --git a/generic/include/clc/integer/max.h b/generic/include/clc/integer/max.h deleted file mode 100644 index e74a459..0000000 --- a/generic/include/clc/integer/max.h +++ /dev/null @@ -1,2 +0,0 @@ -#define BODY <clc/integer/max.inc> -#include <clc/integer/gentype.inc> diff --git a/generic/include/clc/math/max.h b/generic/include/clc/math/max.h deleted file mode 100644 index 3d158f1..0000000 --- a/generic/include/clc/math/max.h +++ /dev/null @@ -1,2 +0,0 @@ -#define BODY <clc/math/max.inc> -#include <clc/math/gentype.inc> diff --git a/generic/include/clc/math/max.inc b/generic/include/clc/math/max.inc deleted file mode 100644 index ce6c6d0..0000000 --- a/generic/include/clc/math/max.inc +++ /dev/null @@ -1 +0,0 @@ -_CLC_OVERLOAD _CLC_DECL GENTYPE max(GENTYPE a, GENTYPE b); diff --git a/generic/include/clc/shared/max.h b/generic/include/clc/shared/max.h new file mode 100644 index 0000000..7967d4a --- /dev/null +++ b/generic/include/clc/shared/max.h @@ -0,0 +1,5 @@ +#define BODY <clc/shared/max.inc> +#include <clc/integer/gentype.inc> + +#define BODY <clc/shared/max.inc> +#include <clc/math/gentype.inc> diff --git a/generic/include/clc/integer/max.inc b/generic/include/clc/shared/max.inc index ce6c6d0..ce6c6d0 100644 --- a/generic/include/clc/integer/max.inc +++ b/generic/include/clc/shared/max.inc diff --git a/generic/lib/SOURCES b/generic/lib/SOURCES index 0d477ba..f639c83 100644 --- a/generic/lib/SOURCES +++ b/generic/lib/SOURCES @@ -8,7 +8,6 @@ integer/abs_diff.cl integer/add_sat.cl integer/add_sat.ll integer/add_sat_impl.ll -integer/max.cl integer/sub_sat.cl integer/sub_sat.ll integer/sub_sat_impl.ll @@ -16,8 +15,8 @@ math/fmax.cl math/fmin.cl math/hypot.cl math/mad.cl -math/max.cl relational/any.cl shared/clamp.cl +shared/max.cl workitem/get_global_id.cl workitem/get_global_size.cl diff --git a/generic/lib/integer/max.cl b/generic/lib/integer/max.cl deleted file mode 100644 index 89fec7c..0000000 --- a/generic/lib/integer/max.cl +++ /dev/null @@ -1,4 +0,0 @@ -#include <clc/clc.h> - -#define BODY <max.inc> -#include <clc/integer/gentype.inc> diff --git a/generic/lib/math/max.inc b/generic/lib/math/max.inc deleted file mode 100644 index 37409fc..0000000 --- a/generic/lib/math/max.inc +++ /dev/null @@ -1,3 +0,0 @@ -_CLC_OVERLOAD _CLC_DEF GENTYPE max(GENTYPE a, GENTYPE b) { - return (a > b ? a : b); -} diff --git a/generic/lib/math/max.cl b/generic/lib/shared/max.cl index d1254a7..5a48537 100644 --- a/generic/lib/math/max.cl +++ b/generic/lib/shared/max.cl @@ -1,5 +1,8 @@ #include <clc/clc.h> +#define BODY <max.inc> +#include <clc/integer/gentype.inc> + #ifdef cl_khr_fp64 #pragma OPENCL EXTENSION cl_khr_fp64 : enable #endif diff --git a/generic/lib/integer/max.inc b/generic/lib/shared/max.inc index 37409fc..37409fc 100644 --- a/generic/lib/integer/max.inc +++ b/generic/lib/shared/max.inc |