diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-05 14:00:23 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-05 14:00:23 +0400 |
| commit | 68f2066602fe9b6461835adccf61f4ed3622829e (patch) | |
| tree | a1eb7f30ecedb631759d5bec98e3877db94ec0d7 | |
| parent | 0106b94f9d691245c54fd906e43ae8ee94b527a4 (diff) | |
Cycles: Make OpenCL folks happy to use __KERNEL_DEBUG__
Quite straightforward change, the only annoying thing is that we can't use
indentation for include directive just because of the way headers inlineing
works for OpenCL.
Might do smarter job in path_source_replace_includes() but don't want to
spend time on this yet.
| -rw-r--r-- | intern/cycles/device/device_opencl.cpp | 6 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_path.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index d950d084cd4..58b2bcafb82 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -102,7 +102,11 @@ static string opencl_kernel_build_options(const string& platform, const string * if(opencl_kernel_use_debug()) build_options += "-D__KERNEL_OPENCL_DEBUG__ "; - + +#ifdef WITH_CYCLES_DEBUG + build_options += "-D__KERNEL_DEBUG__ "; +#endif + return build_options; } diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h index 0e07d8a95f8..56339be1ff9 100644 --- a/intern/cycles/kernel/kernel_path.h +++ b/intern/cycles/kernel/kernel_path.h @@ -46,7 +46,7 @@ #include "kernel_path_volume.h" #ifdef __KERNEL_DEBUG__ -# include "kernel_debug.h" +#include "kernel_debug.h" #endif CCL_NAMESPACE_BEGIN |