diff options
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 535b9489985..1dcd3a52b6a 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -66,9 +66,11 @@ CCL_NAMESPACE_BEGIN #ifdef __KERNEL_OPENCL__ +/* keep __KERNEL_ADV_SHADING__ in sync with opencl_kernel_use_advanced_shading! */ + #ifdef __KERNEL_OPENCL_NVIDIA__ #define __KERNEL_SHADING__ -#define __MULTI_CLOSURE__ +//#define __KERNEL_ADV_SHADING__ #endif #ifdef __KERNEL_OPENCL_APPLE__ @@ -85,6 +87,11 @@ CCL_NAMESPACE_BEGIN #define __EXTRA_NODES__ #endif +#ifdef __KERNEL_OPENCL_INTEL_CPU__ +#define __KERNEL_SHADING__ +#define __KERNEL_ADV_SHADING__ +#endif + #endif /* kernel features */ @@ -122,7 +129,12 @@ CCL_NAMESPACE_BEGIN #define __OBJECT_MOTION__ #define __HAIR__ #endif -//#define __SOBOL_FULL_SCREEN__ + +/* Sanity check */ + +#if defined(__KERNEL_OPENCL_NEED_ADVANCED_SHADING__) && !defined(__MULTI_CLOSURE__) +#error "OpenCL: mismatch between advanced shading flags in device_opencl.cpp and kernel_types.h" +#endif /* Shader Evaluation */ |