diff options
Diffstat (limited to 'intern/cycles/kernel/geom/geom_curve_intersect.h')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_curve_intersect.h | 42 |
1 files changed, 14 insertions, 28 deletions
diff --git a/intern/cycles/kernel/geom/geom_curve_intersect.h b/intern/cycles/kernel/geom/geom_curve_intersect.h index 8378e002506..e9a149ea1ab 100644 --- a/intern/cycles/kernel/geom/geom_curve_intersect.h +++ b/intern/cycles/kernel/geom/geom_curve_intersect.h @@ -31,34 +31,20 @@ ccl_device_inline ssef transform_point_T3(const ssef t[3], const ssef &a) } #endif -#ifdef __KERNEL_SSE2__ -/* Pass P and dir by reference to aligned vector */ -ccl_device_curveintersect bool cardinal_curve_intersect(KernelGlobals *kg, - Intersection *isect, - const float3 &P, - const float3 &dir, - uint visibility, - int object, - int curveAddr, - float time, - int type, - uint *lcg_state, - float difl, - float extmax) -#else -ccl_device_curveintersect bool cardinal_curve_intersect(KernelGlobals *kg, - Intersection *isect, - float3 P, - float3 dir, - uint visibility, - int object, - int curveAddr, - float time, - int type, - uint *lcg_state, - float difl, - float extmax) -#endif +/* On CPU pass P and dir by reference to aligned vector. */ +ccl_device_curveintersect bool cardinal_curve_intersect( + KernelGlobals *kg, + Intersection *isect, + const float3 ccl_ref P, + const float3 ccl_ref dir, + uint visibility, + int object, + int curveAddr, + float time, + int type, + uint *lcg_state, + float difl, + float extmax) { const bool is_curve_primitive = (type & PRIMITIVE_CURVE); |