Cycles: Attempt to workaround compilation error on new CUDA toolkit and sm_2x

2017-03-29 11:49:50 +02:00 · 2017-03-29 11:49:50 +02:00 · 61db9ee27a
parent c2d3bb7090
commit 61db9ee27a
1 changed files with 6 additions and 1 deletions
--- 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,