diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-05-07 00:11:41 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-05-07 00:13:33 +0300 |
| commit | 4422b3f9199cdd13c162ebc16c9e1d1b18f76bae (patch) | |
| tree | e1126c08d85fc4ce51be98b132ce5832f2e227cd /intern/cycles/kernel/kernel_types.h | |
| parent | 734d1aec3f93b8757533284330afc2ac651442bd (diff) | |
Some fixes for CUDA runtime compile:
* When Baking wasn't used we got an error.
* On top of Volume Nodes (NODES_FEATURE_VOLUME), we now also check if we need volume sampling code,
so we can disable that as well and save some further compilation time.
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index c9a895d9aec..02e69c7d75f 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -120,6 +120,7 @@ CCL_NAMESPACE_BEGIN # define __CAMERA_MOTION__ # define __OBJECT_MOTION__ # define __HAIR__ +# define __BAKING__ # ifdef __KERNEL_EXPERIMENTAL__ # define __TRANSPARENT_SHADOWS__ # endif @@ -167,13 +168,14 @@ CCL_NAMESPACE_BEGIN # define __CAMERA_MOTION__ # define __OBJECT_MOTION__ # define __HAIR__ +# define __BAKING__ #endif #ifdef WITH_CYCLES_DEBUG # define __KERNEL_DEBUG__ #endif -/* Scene-based selective featrues compilation. */ +/* Scene-based selective features compilation. */ #ifdef __NO_CAMERA_MOTION__ # undef __CAMERA_MOTION__ #endif @@ -183,9 +185,16 @@ CCL_NAMESPACE_BEGIN #ifdef __NO_HAIR__ # undef __HAIR__ #endif +#ifdef __NO_VOLUME__ +# undef __VOLUME__ +# undef __VOLUME_SCATTER__ +#endif #ifdef __NO_SUBSURFACE__ # undef __SUBSURFACE__ #endif +#ifdef __NO_BAKING__ +# undef __BAKING__ +#endif #ifdef __NO_BRANCHED_PATH__ # undef __BRANCHED_PATH__ #endif |