[Bf-blender-cvs] [8d609d2] cycles_kernel_split: Move definition of ccl_addr_space to kernel_compat_*

[Martijn Berger]

Commit: 8d609d2df91a4d1ed8a1d8429e851f7cc4ff5461
Author: Martijn Berger
Date:   Mon May 4 16:27:55 2015 +0200
Branches: cycles_kernel_split
https://developer.blender.org/rB8d609d2df91a4d1ed8a1d8429e851f7cc4ff5461

Move definition of ccl_addr_space to kernel_compat_*

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

M	intern/cycles/kernel/kernel_compat_cpu.h
M	intern/cycles/kernel/kernel_compat_cuda.h
M	intern/cycles/kernel/kernel_compat_opencl.h
M	intern/cycles/kernel/kernel_types.h

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

diff --git a/intern/cycles/kernel/kernel_compat_cpu.h b/intern/cycles/kernel/kernel_compat_cpu.h
index 200667a..0fa9ef6 100644
--- a/intern/cycles/kernel/kernel_compat_cpu.h
+++ b/intern/cycles/kernel/kernel_compat_cpu.h
@@ -32,6 +32,8 @@
 #include "util_half.h"
 #include "util_types.h"
 
+#define ccl_addr_space
+
 /* On x86_64, versions of glibc < 2.16 have an issue where expf is
  * much slower than the double version.  This was fixed in glibc 2.16.
  */
diff --git a/intern/cycles/kernel/kernel_compat_cuda.h b/intern/cycles/kernel/kernel_compat_cuda.h
index 904736c..476d74d 100644
--- a/intern/cycles/kernel/kernel_compat_cuda.h
+++ b/intern/cycles/kernel/kernel_compat_cuda.h
@@ -33,6 +33,7 @@
 #define ccl_global
 #define ccl_constant
 #define ccl_may_alias
+#define ccl_addr_space
 
 /* No assert supported for CUDA */
 
diff --git a/intern/cycles/kernel/kernel_compat_opencl.h b/intern/cycles/kernel/kernel_compat_opencl.h
index d480ec0..a601b61 100644
--- a/intern/cycles/kernel/kernel_compat_opencl.h
+++ b/intern/cycles/kernel/kernel_compat_opencl.h
@@ -38,6 +38,12 @@
 #define ccl_constant __constant
 #define ccl_global __global
 
+#ifdef __SPLIT_KERNEL__
+#define ccl_addr_space __global
+#else
+#define ccl_addr_space
+#endif
+
 /* no assert in opencl */
 #define kernel_assert(cond)
 
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 17a2718..f04b400 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -17,12 +17,6 @@
 #ifndef __KERNEL_TYPES_H__
 #define __KERNEL_TYPES_H__
 
-#ifdef __SPLIT_KERNEL__
-#define ccl_addr_space __global
-#else
-#define ccl_addr_space
-#endif
-
 #include "kernel_math.h"
 #include "svm/svm_types.h"