diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-03-16 09:16:02 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-03-17 08:54:04 +0300 |
| commit | 60a344b43d19524d5c97c6c19efd5c628b5bbbe1 (patch) | |
| tree | b6a8c19ebdf7da4075f4d0c3e55e5a1b9abfbb1b /intern/cycles/kernel/kernel_types.h | |
| parent | b27e2242768ca39bd832e95a385d3e4ad802059e (diff) | |
Cycles: Fix handling of barriers
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index b6b891627bf..245832ae163 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -32,11 +32,6 @@ # 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 */ |