From cc7386ec6b797dfa96eb8037742e384090f46285 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 29 Mar 2017 15:07:53 +0200 Subject: Cycles: Remove toolkit-specific workaround from kernel --- intern/cycles/kernel/kernel_compat_cuda.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intern/cycles/kernel/kernel_compat_cuda.h b/intern/cycles/kernel/kernel_compat_cuda.h index 3490702d51b..39e98c7dda6 100644 --- a/intern/cycles/kernel/kernel_compat_cuda.h +++ b/intern/cycles/kernel/kernel_compat_cuda.h @@ -38,7 +38,7 @@ #define ccl_device __device__ __inline__ # define ccl_device_forceinline __device__ __forceinline__ -#if (__KERNEL_CUDA_VERSION__ == 80) && (__CUDA_ARCH__ < 500) +#if __CUDA_ARCH__ < 500 # define ccl_device_inline __device__ __forceinline__ #else # define ccl_device_inline __device__ __inline__ -- cgit v1.2.3