[Bf-blender-cvs] [61db9ee27a4] master: Cycles: Attempt to workaround compilation error on new CUDA toolkit and sm_2x

Sergey Sharybin noreply at git.blender.org
Wed Mar 29 11:50:20 CEST 2017


Commit: 61db9ee27a442f30248e6bf48468fee5cc999b6b
Author: Sergey Sharybin
Date:   Wed Mar 29 11:49:50 2017 +0200
Branches: master
https://developer.blender.org/rB61db9ee27a442f30248e6bf48468fee5cc999b6b

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

===================================================================

M	intern/cycles/util/util_math_intersect.h

===================================================================

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,




More information about the Bf-blender-cvs mailing list