diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-11 16:36:08 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-11 16:36:08 +0400 |
| commit | 6686f189480c4de3e91f49a76811bf006ed9f9b2 (patch) | |
| tree | bb7184c7e0117c2766eeb727448d9460113b705a /intern/cycles/kernel/kernel_compat_opencl.h | |
| parent | 18d709022e3ad2208382157a566095c406504d24 (diff) | |
Cycles: more opencl tweaks, status is:
* kernel has shading nodes / textures disabled, amd/nvidia opencl
compilers choke on these, need to figure out how to avoid this
* works in cycles_test, not available as option in blender yet
* kernel compiles and runs with opencl 1.1 from intel/amd/nvidia
Diffstat (limited to 'intern/cycles/kernel/kernel_compat_opencl.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_compat_opencl.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_compat_opencl.h b/intern/cycles/kernel/kernel_compat_opencl.h index 0127093d8ce..3d493c61fe4 100644 --- a/intern/cycles/kernel/kernel_compat_opencl.h +++ b/intern/cycles/kernel/kernel_compat_opencl.h @@ -22,7 +22,10 @@ #define __KERNEL_GPU__ #define __KERNEL_OPENCL__ -CCL_NAMESPACE_BEGIN +/* no namespaces in opencl */ +#define CCL_NAMESPACE_BEGIN +#define CCL_NAMESPACE_END +#define WITH_OPENCL /* in opencl all functions are device functions, so leave this empty */ #define __device @@ -104,7 +107,5 @@ __device float kernel_tex_interp_(__global float *data, int width, float x) #include "util_types.h" -CCL_NAMESPACE_END - #endif /* __KERNEL_COMPAT_OPENCL_H__ */ |