[Bf-blender-cvs] [c86a6f3] master: Cycles: Enable CMJ for Intel/NVidia experimental split kernels

[Sergey Sharybin]

Commit: c86a6f3efbffbf81b663eb1fb57b4736d8e906ee
Author: Sergey Sharybin
Date:   Fri May 15 12:53:50 2015 +0500
Branches: master
https://developer.blender.org/rBc86a6f3efbffbf81b663eb1fb57b4736d8e906ee

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.

===================================================================

M	intern/cycles/kernel/kernel_types.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 72173b7..769ffa8 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__