[Bf-blender-cvs] [cc7386ec6b7] master: Cycles: Remove toolkit-specific workaround from kernel

[Sergey Sharybin]

Commit: cc7386ec6b797dfa96eb8037742e384090f46285
Author: Sergey Sharybin
Date:   Wed Mar 29 15:07:53 2017 +0200
Branches: master
https://developer.blender.org/rBcc7386ec6b797dfa96eb8037742e384090f46285

Cycles: Remove toolkit-specific workaround from kernel

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

M	intern/cycles/kernel/kernel_compat_cuda.h

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

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__