[Bf-blender-cvs] [387e797] cycles_kernel_split: Cycles kernel split: Disable advanced shading for all split kernels

[Sergey Sharybin]

Commit: 387e797c67785f961f112ab135c5036bd964b3d8
Author: Sergey Sharybin
Date:   Wed May 6 00:46:09 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rB387e797c67785f961f112ab135c5036bd964b3d8

Cycles kernel split: Disable advanced shading for all split kernels

It was already disabled for AMD split kernel and since the code in advanced
shading is not ready really ported it only causes compilation error.

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

M	intern/cycles/kernel/kernel_types.h

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

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 118319d..aaa566f 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -90,7 +90,12 @@ CCL_NAMESPACE_BEGIN
 
 #ifdef __KERNEL_OPENCL_NVIDIA__
 #define __KERNEL_SHADING__
-#define __KERNEL_ADV_SHADING__
+/* TODO(sergey): Advanced shading code still requires work
+ * for split kernel.
+ */
+#  ifndef __SPLIT_KERNEL__
+#    define __KERNEL_ADV_SHADING__
+#  endif
 #endif
 
 #ifdef __KERNEL_OPENCL_APPLE__
@@ -117,7 +122,12 @@ CCL_NAMESPACE_BEGIN
 #ifdef __KERNEL_OPENCL_INTEL_CPU__
 #define __CL_USE_NATIVE__
 #define __KERNEL_SHADING__
-#define __KERNEL_ADV_SHADING__
+/* TODO(sergey): Advanced shading code still requires work
+ * for split kernel.
+ */
+#  ifndef __SPLIT_KERNEL__
+#    define __KERNEL_ADV_SHADING__
+#  endif
 #endif
 
 #endif // __KERNEL_OPENCL__