Commit: 960db4c961da6c7faaa0b5fcdbba4d38c90ef298 Author: Sergey Sharybin Date: Wed Aug 3 11:41:58 2016 +0200 Branches: master https://developer.blender.org/rB960db4c961da6c7faaa0b5fcdbba4d38c90ef298
Cycles: Revert recent inline changes for CUDA 8 and sm_50+ This changes actually lead to 2x slowdown. It's getting a bit annoying because those are the changes to make pre-maxwell cards render with the same speed. =================================================================== 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 fb5812e..a039b41 100644 --- a/intern/cycles/kernel/kernel_compat_cuda.h +++ b/intern/cycles/kernel/kernel_compat_cuda.h @@ -36,7 +36,11 @@ /* Qualifier wrappers for different names on different devices */ #define ccl_device __device__ __inline__ -#define ccl_device_inline __device__ __forceinline__ +#if (__KERNEL_CUDA_VERSION__ == 80) && (__CUDA_ARCH__ < 500) +# define ccl_device_inline __device__ __forceinline__ +#else +# define ccl_device_inline __device__ __inline__ +#endif #define ccl_device_noinline __device__ __noinline__ #define ccl_global #define ccl_constant _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
