diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-09 22:53:54 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-09 22:53:54 +0400 |
| commit | abc601d10ee51aa8de83004094e2e6c73e96e2eb (patch) | |
| tree | d1b9c16183f4138a85732ffb443578d7d1ae359e /intern/cycles/util | |
| parent | 40886b6965062f84a7b3d8b73b79027e2a4e3caf (diff) | |
Cycles: opencl 1.1 compatibility tweaks.
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_math.h | 4 | ||||
| -rw-r--r-- | intern/cycles/util/util_types.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h index 1bb3f5b6097..c435a9e17b8 100644 --- a/intern/cycles/util/util_math.h +++ b/intern/cycles/util/util_math.h @@ -38,12 +38,16 @@ CCL_NAMESPACE_BEGIN +#ifndef __KERNEL_OPENCL__ + #define M_PI_F ((float)3.14159265358979323846264338327950288) #define M_PI_2_F ((float)1.57079632679489661923132169163975144) #define M_PI_4_F ((float)0.785398163397448309615660845819875721) #define M_1_PI_F ((float)0.318309886183790671537767526745028724) #define M_2_PI_F ((float)0.636619772367581343075535053490057448) +#endif + /* Scalar */ #ifdef _WIN32 diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h index 02ab59a261f..12ae60f1143 100644 --- a/intern/cycles/util/util_types.h +++ b/intern/cycles/util/util_types.h @@ -70,9 +70,13 @@ CCL_NAMESPACE_BEGIN /* Shorter Unsigned Names */ +#ifndef __KERNEL_OPENCL__ + typedef unsigned char uchar; typedef unsigned int uint; +#endif + #ifndef __KERNEL_GPU__ /* Fixed Bits Types */ |