diff options
| author | Thomas Dinges <blender@dingto.org> | 2018-02-18 00:19:54 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2018-02-18 00:19:54 +0300 |
| commit | e1ef902058149b6feee96d87e58b26582c522b2d (patch) | |
| tree | 90b7fb055c91a11553fe629756836e8dcfbe3786 /intern/cycles/kernel/kernel_compat_cuda.h | |
| parent | 2eaf90b305fc6fb37f775f288c3d5cd34cc66c81 (diff) | |
Cycles: Remove fermi related defines from the code.
Did not touch Texture related defines, that comes next.
Diffstat (limited to 'intern/cycles/kernel/kernel_compat_cuda.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_compat_cuda.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_compat_cuda.h b/intern/cycles/kernel/kernel_compat_cuda.h index 900f7fe6a2c..1daa7f0db16 100644 --- a/intern/cycles/kernel/kernel_compat_cuda.h +++ b/intern/cycles/kernel/kernel_compat_cuda.h @@ -50,10 +50,7 @@ __device__ half __float2half(const float f) /* Qualifier wrappers for different names on different devices */ #define ccl_device __device__ __inline__ -#if __CUDA_ARCH__ < 300 -# define ccl_device_inline __device__ __inline__ -# define ccl_device_forceinline __device__ __forceinline__ -#elif __CUDA_ARCH__ < 500 +#if __CUDA_ARCH__ < 500 # define ccl_device_inline __device__ __forceinline__ # define ccl_device_forceinline __device__ __forceinline__ #else |