diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-05-15 10:53:50 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-05-15 11:22:47 +0300 |
| commit | c86a6f3efbffbf81b663eb1fb57b4736d8e906ee (patch) | |
| tree | e8b248dcdcebc8e1ec8a91982e9d66f161b18a96 /intern | |
| parent | c2b9f784153f20b75444632ef3b57aa3b1597f31 (diff) | |
Cycles: Enable CMJ for Intel/NVidia experimental split kernels
It is still disabled for AMD devices since can't test if it works fine
on this hardware.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 72173b72df8..769ffa87e4e 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -112,6 +112,9 @@ CCL_NAMESPACE_BEGIN # define __HAIR__ # define __CAMERA_MOTION__ # endif +# ifdef __KERNEL_EXPERIMENTAL__ +# define __CMJ__ +# endif #endif #ifdef __KERNEL_OPENCL_APPLE__ @@ -136,9 +139,12 @@ CCL_NAMESPACE_BEGIN #endif #ifdef __KERNEL_OPENCL_INTEL_CPU__ -#define __CL_USE_NATIVE__ -#define __KERNEL_SHADING__ -#define __KERNEL_ADV_SHADING__ +# define __CL_USE_NATIVE__ +# define __KERNEL_SHADING__ +# define __KERNEL_ADV_SHADING__ +# ifdef __KERNEL_EXPERIMENTAL__ +# define __CMJ__ +# endif #endif #endif // __KERNEL_OPENCL__ |