Cycles: Fix CUDA build error for some compilers
authorMai Lavelle <mai.lavelle@gmail.com>
Wed, 8 Mar 2017 21:44:43 +0000 (16:44 -0500)
committerMai Lavelle <mai.lavelle@gmail.com>
Wed, 8 Mar 2017 21:44:43 +0000 (16:44 -0500)
Needed to include `util_types.h` before using `uint`.

intern/cycles/kernel/kernel_compat_cuda.h

index 8fffe2a13c91342ed83876000f01e2ac32a67dfe..37a9e8d2f843d38ce0ee57894051cfc4a21cd386 100644 (file)
 #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;