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/kernel/kernel_types.h | |
| parent | 40886b6965062f84a7b3d8b73b79027e2a4e3caf (diff) | |
Cycles: opencl 1.1 compatibility tweaks.
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index fbe827b1791..992a4d95b54 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -27,6 +27,7 @@ CCL_NAMESPACE_BEGIN #define OBJECT_SIZE 16 +#define __SOBOL__ #define __INSTANCING__ #define __DPDU__ #define __UV__ @@ -34,8 +35,9 @@ CCL_NAMESPACE_BEGIN #define __EMISSION__ #define __CAUSTICS_TRICKS__ #define __SVM__ -#define __SOBOL__ +#ifndef __KERNEL_OPENCL__ #define __TEXTURES__ +#endif #define __RAY_DIFFERENTIALS__ #define __CAMERA_CLIPPING__ #define __INTERSECTION_REFINE__ @@ -286,9 +288,13 @@ typedef struct KernelCamera { /* differentials */ float3 dx; +#ifndef WITH_OPENCL float pad1; +#endif float3 dy; +#ifndef WITH_OPENCL float pad2; +#endif /* clipping */ float nearclip; @@ -321,7 +327,9 @@ typedef struct KernelSunSky { /* sun direction in spherical and cartesian */ float theta, phi, pad3, pad4; float3 dir; +#ifndef WITH_OPENCL float pad; +#endif /* perez function parameters */ float zenith_Y, zenith_x, zenith_y, pad2; |