diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-16 03:17:10 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-18 11:48:15 +0400 |
| commit | c18712e86814d176433cea781fe1e68715c23bd4 (patch) | |
| tree | a9aa7a0b34940dceb00f290c720f4a2733819f44 /intern/cycles/kernel/kernel_compat_opencl.h | |
| parent | 6f67f7c18cf2c6224f3e3d796bf0d83d2f098b2e (diff) | |
Cycles: change __device and similar qualifiers to ccl_device in kernel code.
This to avoids build conflicts with libc++ on FreeBSD, these __ prefixed values
are reserved for compilers. I apologize to anyone who has patches or branches
and has to go through the pain of merging this change, it may be easiest to do
these same replacements in your code and then apply/merge the patch.
Ref T37477.
Diffstat (limited to 'intern/cycles/kernel/kernel_compat_opencl.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_compat_opencl.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/intern/cycles/kernel/kernel_compat_opencl.h b/intern/cycles/kernel/kernel_compat_opencl.h index e0102a01146..1ff3615e448 100644 --- a/intern/cycles/kernel/kernel_compat_opencl.h +++ b/intern/cycles/kernel/kernel_compat_opencl.h @@ -33,16 +33,18 @@ #endif #ifdef __CL_NOINLINE__ -#define __noinline __attribute__((noinline)) +#define ccl_noinline __attribute__((noinline)) #else -#define __noinline +#define ccl_noinline #endif /* in opencl all functions are device functions, so leave this empty */ -#define __device -#define __device_inline __device -#define __device_noinline __device __noinline -#define __may_alias +#define ccl_device +#define ccl_device_inline ccl_device +#define ccl_device_noinline ccl_device ccl_noinline +#define ccl_may_alias +#define ccl_constant __constant +#define ccl_global __global /* no assert in opencl */ #define kernel_assert(cond) |