diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-02-14 14:20:48 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-03-08 08:52:41 +0300 |
| commit | 0892352bfe6d5a9aa6ec4c088e67f8bbbbfae610 (patch) | |
| tree | 83e4169e46d1fc7c2de5884169902841f6c75db9 /intern/cycles/kernel/kernel_types.h | |
| parent | 352ee7c3ef2b84568dd419edd208eb6619498f45 (diff) | |
Cycles: CPU implementation of split kernel
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 279cd6dedab..a016e5293ca 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -32,6 +32,11 @@ # define ccl_addr_space #endif +#if defined(__SPLIT_KERNEL__) && !defined(__COMPUTE_DEVICE_GPU__) +/* TODO(mai): need to investigate how this effects the kernel, as cpu kernel crashes without this right now */ +#define __COMPUTE_DEVICE_GPU__ +#endif + CCL_NAMESPACE_BEGIN /* constants */ @@ -65,17 +70,23 @@ CCL_NAMESPACE_BEGIN # endif # define __KERNEL_SHADING__ # define __KERNEL_ADV_SHADING__ -# define __BRANCHED_PATH__ +# ifndef __SPLIT_KERNEL__ +# define __BRANCHED_PATH__ +# endif # ifdef WITH_OSL # define __OSL__ # endif -# define __SUBSURFACE__ +# ifndef __SPLIT_KERNEL__ +# define __SUBSURFACE__ +# endif # define __CMJ__ -# define __VOLUME__ -# define __VOLUME_DECOUPLED__ -# define __VOLUME_SCATTER__ -# define __SHADOW_RECORD_ALL__ -# define __VOLUME_RECORD_ALL__ +# ifndef __SPLIT_KERNEL__ +# define __VOLUME__ +# define __VOLUME_DECOUPLED__ +# define __VOLUME_SCATTER__ +# define __SHADOW_RECORD_ALL__ +# define __VOLUME_RECORD_ALL__ +# endif #endif /* __KERNEL_CPU__ */ #ifdef __KERNEL_CUDA__ |