diff options
author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-03-09 00:44:43 +0300 |
---|---|---|
committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-03-09 00:44:43 +0300 |
commit | c837bd5ea55978276adf5ab07fb8146b3c468375 (patch) | |
tree | 1d9b3089080525ddfcdc1822e6f9ddc21f7a52b5 /intern | |
parent | 45b764e95b9e34cb17dece1cd37eb80dafa1924f (diff) |
Cycles: Fix CUDA build error for some compilers
Needed to include `util_types.h` before using `uint`.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/kernel/kernel_compat_cuda.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/intern/cycles/kernel/kernel_compat_cuda.h b/intern/cycles/kernel/kernel_compat_cuda.h index 8fffe2a13c9..37a9e8d2f84 100644 --- a/intern/cycles/kernel/kernel_compat_cuda.h +++ b/intern/cycles/kernel/kernel_compat_cuda.h @@ -54,6 +54,17 @@ #define ccl_restrict __restrict__ #define ccl_align(n) __align__(n) +/* No assert supported for CUDA */ + +#define kernel_assert(cond) + +/* Types */ + +#include "util_half.h" +#include "util_types.h" + +/* Work item functions */ + ccl_device_inline uint ccl_local_id(uint d) { switch(d) { @@ -98,15 +109,6 @@ ccl_device_inline uint ccl_num_groups(uint d) } } -/* No assert supported for CUDA */ - -#define kernel_assert(cond) - -/* Types */ - -#include "util_half.h" -#include "util_types.h" - /* Textures */ typedef texture<float4, 1> texture_float4; |