[Bf-blender-cvs] [c837bd5ea55] master: Cycles: Fix CUDA build error for some compilers

[Mai Lavelle]

Commit: c837bd5ea55978276adf5ab07fb8146b3c468375
Author: Mai Lavelle
Date:   Wed Mar 8 16:44:43 2017 -0500
Branches: master
https://developer.blender.org/rBc837bd5ea55978276adf5ab07fb8146b3c468375

Cycles: Fix CUDA build error for some compilers

Needed to include `util_types.h` before using `uint`.

===================================================================

M	intern/cycles/kernel/kernel_compat_cuda.h

===================================================================

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;