diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-29 17:35:21 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-29 17:35:21 +0300 |
| commit | ddf8c49736864fe89348c002fecaacdcb1c28c8e (patch) | |
| tree | 0d42efff1ca7e94ca9282f2e0d7fb5cd0fdf3196 /intern/cycles | |
| parent | 8864dde5bb39f11ddc28f4108e944611662826a7 (diff) | |
Fix Cycles CUDA build after recent changes.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_triangle_intersect.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h index f8c671fed14..aa6b102a0f3 100644 --- a/intern/cycles/kernel/geom/geom_triangle_intersect.h +++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h @@ -70,6 +70,8 @@ ccl_device_inline bool triangle_intersect(KernelGlobals *kg, return false; } +#ifdef __KERNEL_AVX2__ + #define cross256(A,B, C,D) _mm256_fmsub_ps(A,B, _mm256_mul_ps(C,D)) #if defined(__KERNEL_CUDA__) && __CUDA_ARCH__ < 300 ccl_device_inline @@ -542,6 +544,8 @@ int triangle_intersect8(KernelGlobals *kg, return result; } +#endif /* __KERNEL_AVX2__ */ + /* Special ray intersection routines for subsurface scattering. In that case we * only want to intersect with primitives in the same object, and if case of * multiple hits we pick a single random primitive as the intersection point. |