Move mix from math to common
authorAaron Watry <awatry@gmail.com>
Tue, 3 Mar 2015 21:25:08 +0000 (21:25 +0000)
committerAaron Watry <awatry@gmail.com>
Tue, 3 Mar 2015 21:25:08 +0000 (21:25 +0000)
It has been part of the common functions since 1.0

Signed-off-by: Aaron Watry <awatry@gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
llvm-svn: 231137

libclc/generic/include/clc/clc.h
libclc/generic/include/clc/common/mix.h [new file with mode: 0644]
libclc/generic/include/clc/common/mix.inc [moved from libclc/generic/include/clc/math/mix.inc with 100% similarity]
libclc/generic/include/clc/math/mix.h [deleted file]
libclc/generic/lib/SOURCES
libclc/generic/lib/common/mix.cl [moved from libclc/generic/lib/math/mix.cl with 100% similarity]
libclc/generic/lib/common/mix.inc [moved from libclc/generic/lib/math/mix.inc with 100% similarity]

index 92ef769..ae611a5 100644 (file)
@@ -55,7 +55,6 @@
 #include <clc/math/log1p.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/pown.h>
 /* 6.11.4 Common Functions */
 #include <clc/common/degrees.h>
 #include <clc/common/radians.h>
+#include <clc/common/mix.h>
 #include <clc/common/sign.h>
 #include <clc/common/smoothstep.h>
 #include <clc/common/step.h>
diff --git a/libclc/generic/include/clc/common/mix.h b/libclc/generic/include/clc/common/mix.h
new file mode 100644 (file)
index 0000000..262861c
--- /dev/null
@@ -0,0 +1,2 @@
+#define __CLC_BODY <clc/common/mix.inc>
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/include/clc/math/mix.h b/libclc/generic/include/clc/math/mix.h
deleted file mode 100644 (file)
index c3c95c1..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#define __CLC_BODY <clc/math/mix.inc>
-#include <clc/math/gentype.inc>
index f0488ef..8411b8f 100644 (file)
@@ -28,6 +28,7 @@ cl_khr_local_int32_extended_atomics/atom_or.cl
 cl_khr_local_int32_extended_atomics/atom_xor.cl
 convert.cl
 common/degrees.cl
+common/mix.cl
 common/radians.cl
 common/sign.cl
 common/smoothstep.cl
@@ -71,7 +72,6 @@ math/hypot.cl
 math/log10.cl
 math/log1p.cl
 math/mad.cl
-math/mix.cl
 math/tables.cl
 math/clc_nextafter.cl
 math/nextafter.cl