diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-06-15 03:09:35 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-06-15 03:09:59 +0400 |
| commit | 6443bfdeb1b606cf5fcb7bf132792bd0a6c00674 (patch) | |
| tree | dfc76a3b9b5b70d14f66321de9d060ebf126b30f /intern/cycles/kernel/kernel_compat_opencl.h | |
| parent | b5213b2dea984afcc1c1528c97a70168c2faf25a (diff) | |
* Fix OpenCL after uchar4 commit.
Diffstat (limited to 'intern/cycles/kernel/kernel_compat_opencl.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_compat_opencl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_compat_opencl.h b/intern/cycles/kernel/kernel_compat_opencl.h index 8346b09619e..9e58ebff599 100644 --- a/intern/cycles/kernel/kernel_compat_opencl.h +++ b/intern/cycles/kernel/kernel_compat_opencl.h @@ -68,6 +68,9 @@ #ifdef make_int4 #undef make_int4 #endif +#ifdef make_uchar4 +#undef make_uchar4 +#endif #define make_float2(x, y) ((float2)(x, y)) #ifdef __CL_NO_FLOAT3__ @@ -79,6 +82,7 @@ #define make_int2(x, y) ((int2)(x, y)) #define make_int3(x, y, z) ((int3)(x, y, z)) #define make_int4(x, y, z, w) ((int4)(x, y, z, w)) +#define make_uchar4(x, y, z, w) ((uchar4)(x, y, z, w)) /* math functions */ #define __uint_as_float(x) as_float(x) |