diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-31 20:21:30 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-31 20:21:30 +0400 |
| commit | 966e004bbea6304840cd73f262d91a5e65464e5f (patch) | |
| tree | b9d4a9e233e471e2fa143e27b26058d6093c9d56 /intern/cycles/kernel/kernel_compat_opencl.h | |
| parent | fc68daff582664bc1ccba57b9408973c5e8d83ec (diff) | |
Cycles: OSL build & image manager fixes.
Diffstat (limited to 'intern/cycles/kernel/kernel_compat_opencl.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_compat_opencl.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_compat_opencl.h b/intern/cycles/kernel/kernel_compat_opencl.h index c8be03d7dd0..6ff9340e645 100644 --- a/intern/cycles/kernel/kernel_compat_opencl.h +++ b/intern/cycles/kernel/kernel_compat_opencl.h @@ -42,6 +42,25 @@ __device float kernel_tex_interp_(__global float *data, int width, float x) return (1.0f - t)*data[index] + t*data[nindex]; } +#ifdef make_float2 +#undef make_float2 +#endif +#ifdef make_float3 +#undef make_float3 +#endif +#ifdef make_float4 +#undef make_float4 +#endif +#ifdef make_int2 +#undef make_int2 +#endif +#ifdef make_int3 +#undef make_int3 +#endif +#ifdef make_int4 +#undef make_int4 +#endif + #define make_float2(x, y) ((float2)(x, y)) #define make_float3(x, y, z) ((float3)(x, y, z, 0.0f)) #define make_float4(x, y, z, w) ((float4)(x, y, z, w)) @@ -49,6 +68,13 @@ __device float kernel_tex_interp_(__global float *data, int width, float x) #define make_int3(x, y, z) ((int3)(x, y, z, 0)) #define make_int4(x, y, z, w) ((int4)(x, y, z, w)) +#ifdef float3 +#undef float3 +#endif +#ifdef int3 +#undef int3 +#endif + typedef float4 float3; typedef int4 int3; |