diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-04-21 20:07:43 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-04-21 20:08:01 +0400 |
| commit | f6abc96b6b3ee53e100263e93de2e4323cd7231e (patch) | |
| tree | 4c218e8620780241611a45f6329af091ca9f05f2 | |
| parent | ea753710bf81560ebf0d7c7639e69758246a5076 (diff) | |
Cleanup: Remove OpenCL __MULTI_CLOSURE__ sanity check, not needed anymore after 04a10907dc41.
| -rw-r--r-- | intern/cycles/device/device_opencl.cpp | 3 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index 16958f8b293..9a5b2611660 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -101,9 +101,6 @@ static string opencl_kernel_build_options(const string& platform, const string * if(opencl_kernel_use_debug()) build_options += "-D__KERNEL_OPENCL_DEBUG__ "; - - if(opencl_kernel_use_advanced_shading(platform)) - build_options += "-D__KERNEL_OPENCL_NEED_ADVANCED_SHADING__ "; return build_options; } diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 42d6ae68348..93e8bf14782 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -151,12 +151,6 @@ CCL_NAMESPACE_BEGIN #define __HAIR__ #endif -/* 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 - /* Random Numbers */ typedef uint RNG; |