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/kernel/geom/geom_curve_intersect.h | |
| 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/kernel/geom/geom_curve_intersect.h')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_curve_intersect.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/intern/cycles/kernel/geom/geom_curve_intersect.h b/intern/cycles/kernel/geom/geom_curve_intersect.h index e9a149ea1ab..7f24aea5d28 100644 --- a/intern/cycles/kernel/geom/geom_curve_intersect.h +++ b/intern/cycles/kernel/geom/geom_curve_intersect.h @@ -18,12 +18,6 @@ CCL_NAMESPACE_BEGIN #ifdef __HAIR__ -#if defined(__KERNEL_CUDA__) && (__CUDA_ARCH__ < 300) -# define ccl_device_curveintersect ccl_device -#else -# define ccl_device_curveintersect ccl_device_forceinline -#endif - #ifdef __KERNEL_SSE2__ ccl_device_inline ssef transform_point_T3(const ssef t[3], const ssef &a) { @@ -32,7 +26,7 @@ ccl_device_inline ssef transform_point_T3(const ssef t[3], const ssef &a) #endif /* On CPU pass P and dir by reference to aligned vector. */ -ccl_device_curveintersect bool cardinal_curve_intersect( +ccl_device_forceinline bool cardinal_curve_intersect( KernelGlobals *kg, Intersection *isect, const float3 ccl_ref P, @@ -505,7 +499,7 @@ ccl_device_curveintersect bool cardinal_curve_intersect( return hit; } -ccl_device_curveintersect bool curve_intersect(KernelGlobals *kg, +ccl_device_forceinline bool curve_intersect(KernelGlobals *kg, Intersection *isect, float3 P, float3 direction, |