diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-09 16:04:39 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-09 16:04:39 +0400 |
commit | cfbd6cf154bbc653422f30b2bf8077545f5fb99c (patch) | |
tree | b32a82345cf6d87f56ede78a8bdf1cd18ca2f0f3 /intern/cycles/kernel/kernel_compat_cuda.h | |
parent | 9b31cba74e2bd84e9988ebdab723e6e43f9b8357 (diff) |
Cycles:
* OpenCL now only uses GPU/Accelerator devices, it's only confusing if CPU
device is used, easy to enable in the code for debugging.
* OpenCL kernel binaries are now cached for faster startup after the first
time compiling.
* CUDA kernels can now be compiled and cached at runtime if the CUDA toolkit
is installed. This means that even if the build does not have CUDA enabled,
it's still possible to use it as long as you install the toolkit.
Diffstat (limited to 'intern/cycles/kernel/kernel_compat_cuda.h')
-rw-r--r-- | intern/cycles/kernel/kernel_compat_cuda.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_compat_cuda.h b/intern/cycles/kernel/kernel_compat_cuda.h index 3a0eff5210c..72aef463cab 100644 --- a/intern/cycles/kernel/kernel_compat_cuda.h +++ b/intern/cycles/kernel/kernel_compat_cuda.h @@ -21,14 +21,14 @@ #define __KERNEL_GPU__ #define __KERNEL_CUDA__ +#define CCL_NAMESPACE_BEGIN +#define CCL_NAMESPACE_END #include <cuda.h> #include <float.h> #include "util_types.h" -CCL_NAMESPACE_BEGIN - /* Qualifier wrappers for different names on different devices */ #define __device __device__ __inline__ @@ -60,7 +60,5 @@ typedef texture<uchar4, 2, cudaReadModeNormalizedFloat> texture_image_uchar4; #define kernel_data __data -CCL_NAMESPACE_END - #endif /* __KERNEL_COMPAT_CUDA_H__ */ |