diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-05-29 03:51:06 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-05-29 03:51:06 +0400 |
| commit | a7c68afc72e86fff714481f9c2ce796f8782fdb5 (patch) | |
| tree | aaa23d0c908adb51039f8e253b1122b481237aa9 /intern/cycles/kernel/kernel_compat_cuda.h | |
| parent | 53082c410d33f59c39143c3baa680b9634b7609a (diff) | |
Cycles / CUDA:
* Remove double declaration of cosf.
Diffstat (limited to 'intern/cycles/kernel/kernel_compat_cuda.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_compat_cuda.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_compat_cuda.h b/intern/cycles/kernel/kernel_compat_cuda.h index 06bdce6c35c..40bae069dea 100644 --- a/intern/cycles/kernel/kernel_compat_cuda.h +++ b/intern/cycles/kernel/kernel_compat_cuda.h @@ -67,7 +67,6 @@ typedef texture<uchar4, 2, cudaReadModeNormalizedFloat> texture_image_uchar4; #define cosf(x) __cosf(((float)x)) #define sinf(x) __sinf(((float)x)) #define powf(x, y) __powf(((float)x), ((float)y)) -#define cosf(x) __cosf(((float)x)) #define tanf(x) __tanf(((float)x)) #define logf(x) __logf(((float)x)) #define expf(x) __expf(((float)x)) |