[Bf-blender-cvs] [de96d1a] blender-v2.76-release: Blender 2.76a: Fix CUDA compilation on 32bit platform

Sergey Sharybin noreply at git.blender.org
Thu Oct 29 16:11:45 CET 2015


Commit: de96d1acd1d50f112c613247c5bfce1f52097097
Author: Sergey Sharybin
Date:   Thu Oct 29 20:11:22 2015 +0500
Branches: blender-v2.76-release
https://developer.blender.org/rBde96d1acd1d50f112c613247c5bfce1f52097097

Blender 2.76a: Fix CUDA compilation on 32bit platform

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

M	intern/cycles/kernel/geom/geom_triangle_intersect.h

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

diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h
index 970616e..9cc31ca 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -51,11 +51,7 @@ typedef struct IsectPrecalc {
 
 #if defined(__KERNEL_CUDA__)
 #  if (defined(i386) || defined(_M_IX86))
-#    if __CUDA_ARCH__ > 500
 ccl_device_noinline
-#    else  /* __CUDA_ARCH__ > 500 */
-ccl_device_inline
-#    endif  /* __CUDA_ARCH__ > 500 */
 #  else  /* (defined(i386) || defined(_M_IX86)) */
 #    if defined(__KERNEL_EXPERIMENTAL__) && (__CUDA_ARCH__ >= 500)
 ccl_device_noinline
@@ -201,7 +197,13 @@ ccl_device_inline bool triangle_intersect(KernelGlobals *kg,
  */
 
 #ifdef __SUBSURFACE__
-ccl_device_inline void triangle_intersect_subsurface(
+
+#if defined(__KERNEL_CUDA__) && (defined(i386) || defined(_M_IX86))
+ccl_device_noinline
+#else
+ccl_device_inline
+#endif
+void triangle_intersect_subsurface(
         KernelGlobals *kg,
         const IsectPrecalc *isect_precalc,
         Intersection *isect_array,




More information about the Bf-blender-cvs mailing list