From c86a6f3efbffbf81b663eb1fb57b4736d8e906ee Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 15 May 2015 12:53:50 +0500 Subject: [PATCH] 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. --- intern/cycles/kernel/kernel_types.h | 12 +++++++++--- 1 file 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__