From e1ef902058149b6feee96d87e58b26582c522b2d Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Sat, 17 Feb 2018 22:19:54 +0100 Subject: Cycles: Remove fermi related defines from the code. Did not touch Texture related defines, that comes next. --- intern/cycles/util/util_math_intersect.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'intern/cycles/util') diff --git a/intern/cycles/util/util_math_intersect.h b/intern/cycles/util/util_math_intersect.h index 498c21b9706..61ddcc38f50 100644 --- a/intern/cycles/util/util_math_intersect.h +++ b/intern/cycles/util/util_math_intersect.h @@ -79,12 +79,7 @@ ccl_device bool ray_aligned_disk_intersect( return true; } -#if defined(__KERNEL_CUDA__) && __CUDA_ARCH__ < 300 -ccl_device_inline -#else -ccl_device_forceinline -#endif -bool ray_triangle_intersect( +ccl_device_forceinline bool ray_triangle_intersect( float3 ray_P, float3 ray_dir, float ray_t, #if defined(__KERNEL_SSE2__) && defined(__KERNEL_SSE__) const ssef *ssef_verts, -- cgit v1.2.3