[Bf-blender-cvs] [cc29cdb] cycles_kernel_split: Restore original state of kernel_types.h

[varunsundar08]

Commit: cc29cdb7ad160a4e5f01c5fe751c66eaaff98017
Author: varunsundar08
Date:   Tue Apr 28 15:12:38 2015 +0530
Branches: cycles_kernel_split
https://developer.blender.org/rBcc29cdb7ad160a4e5f01c5fe751c66eaaff98017

Restore original state of kernel_types.h

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

M	intern/cycles/kernel/kernel_types.h

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

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index b22ebae..fbc85df 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -97,69 +97,41 @@ CCL_NAMESPACE_BEGIN
 
 #ifdef __KERNEL_OPENCL__
 
-/// hack: device_opencl.cpp needs to retrieve GPU capabilities
-#ifdef __OBJECT_MOTION__
-#undef __OBJECT_MOTION__
-#endif
-#ifdef __OSL__
-#undef __OSL__
-#endif
-#ifdef __SUBSURFACE__
-#undef __SUBSURFACE__
-#endif
-#ifdef __CMJ__
-#undef __CMJ__
-#endif
-#ifdef __VOLUME__
-#undef __VOLUME__
-#endif
-#ifdef __VOLUME_DECOUPLED__
-#undef __VOLUME_DECOUPLED__
-#endif
-#ifdef __VOLUME_SCATTER__
-#undef __VOLUME_SCATTER__
-#endif
-#ifdef __SHADOW_RECORD_ALL__
-#undef __SHADOW_RECORD_ALL__
-#endif
-#ifdef __KERNEL_DEBUG__
-#undef __KERNEL_DEBUG__
+/* keep __KERNEL_ADV_SHADING__ in sync with opencl_kernel_use_advanced_shading! */
+
+#ifdef __KERNEL_OPENCL_NVIDIA__
+#define __KERNEL_SHADING__
+#define __KERNEL_ADV_SHADING__
 #endif
-#ifdef __KERNEL_ADV_SHADING__
-#undef __KERNEL_ADV_SHADING__
+
+#ifdef __KERNEL_OPENCL_APPLE__
+#define __KERNEL_SHADING__
+//#define __KERNEL_ADV_SHADING__
 #endif
 
-/// let NVIDIA & AMD OPENCL share the same features
-//#if defined(__KERNEL_OPENCL_SPLIT_KERNEL__) || defined(__KERNEL_OPENCL_NVIDIA__)
+#ifdef __KERNEL_OPENCL_AMD__
 #define __CL_USE_NATIVE__
 #define __KERNEL_SHADING__
 //__KERNEL_ADV_SHADING__
 #define __MULTI_CLOSURE__
+#define __TRANSPARENT_SHADOWS__
 #define __PASSES__
 #define __BACKGROUND_MIS__
 #define __LAMP_MIS__
 #define __AO__
-//#define __TRANSPARENT_SHADOWS__
 //#define __CAMERA_MOTION__
-//#define __HAIR__
 //#define __OBJECT_MOTION__
+//#define __HAIR__
 //end __KERNEL_ADV_SHADING__
-//#define __BRANCHED_PATH__
-//#endif
-
-/*
-#ifdef __KERNEL_OPENCL_APPLE__
-#define __KERNEL_SHADING__
-//#define __KERNEL_ADV_SHADING__
 #endif
+
 #ifdef __KERNEL_OPENCL_INTEL_CPU__
 #define __CL_USE_NATIVE__
 #define __KERNEL_SHADING__
 #define __KERNEL_ADV_SHADING__
 #endif
-*/
 
-#endif /// OPENCL
+#endif // __KERNEL_OPENCL__
 
 /* kernel features */
 #define __SOBOL__
@@ -1133,6 +1105,8 @@ typedef struct DebugData {
 } DebugData;
 #endif
 
+/* Declarations required for split kernel */
+
 /* Macro for queues */
 /* Value marking queue's empty slot */
 #define QUEUE_EMPTY_SLOT -1