diff options
author | Aaron Watry <awatry@gmail.com> | 2015-03-03 21:25:08 +0000 |
---|---|---|
committer | Aaron Watry <awatry@gmail.com> | 2015-03-03 21:25:08 +0000 |
commit | 1314630ec352029b9e2413060e1e1b7e48c58f80 (patch) | |
tree | 31e372b6da3037b0349d99b3b9c2817506dab5fe /libclc/generic/include/clc/clc.h | |
parent | 7f1e0565b32db8b0b82f78e680718a9703445bc8 (diff) | |
download | bcm5719-llvm-1314630ec352029b9e2413060e1e1b7e48c58f80.tar.gz bcm5719-llvm-1314630ec352029b9e2413060e1e1b7e48c58f80.zip |
Move mix from math to common
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
Diffstat (limited to 'libclc/generic/include/clc/clc.h')
-rw-r--r-- | libclc/generic/include/clc/clc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libclc/generic/include/clc/clc.h b/libclc/generic/include/clc/clc.h index 92ef769dde5..ae611a51684 100644 --- a/libclc/generic/include/clc/clc.h +++ b/libclc/generic/include/clc/clc.h @@ -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> @@ -110,6 +109,7 @@ /* 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> |