diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-29 12:49:50 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-29 12:50:17 +0300 |
| commit | 61db9ee27a442f30248e6bf48468fee5cc999b6b (patch) | |
| tree | 9a6b767755910c8cee7a6cae32016e30927abf37 | |
| parent | c2d3bb709044b7a2730b9fb5005657f38eaff6f2 (diff) | |
Cycles: Attempt to workaround compilation error on new CUDA toolkit and sm_2x
| -rw-r--r-- | intern/cycles/util/util_math_intersect.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/cycles/util/util_math_intersect.h b/intern/cycles/util/util_math_intersect.h index f0f505c311e..2b65a0dfa48 100644 --- a/intern/cycles/util/util_math_intersect.h +++ b/intern/cycles/util/util_math_intersect.h @@ -79,7 +79,12 @@ ccl_device bool ray_aligned_disk_intersect( return true; } -ccl_device_forceinline bool ray_triangle_intersect( +#if defined(__KERNEL_CUDA__) && __CUDA_ARCH__ < 300 +ccl_device_inline +#else +ccl_device_forceinline +#endif +bool ray_triangle_intersect( float3 ray_P, float3 ray_dir, float ray_t, #if defined(__KERNEL_SSE2__) && defined(__KERNEL_SSE__) const ssef *ssef_verts, |