Cycles: Fix CUDA build error for some compilers

Needed to include `util_types.h` before using `uint`.
This commit is contained in:
Mai Lavelle 2017-03-08 16:44:43 -05:00
parent 45b764e95b
commit c837bd5ea5
1 changed files with 11 additions and 9 deletions

View File

@ -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;