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/util | |
| 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/util')
| -rw-r--r-- | intern/cycles/util/util_math_intersect.h | 7 |
1 files changed, 1 insertions, 6 deletions
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, |