From de96d1acd1d50f112c613247c5bfce1f52097097 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 29 Oct 2015 20:11:22 +0500 Subject: Blender 2.76a: Fix CUDA compilation on 32bit platform --- intern/cycles/kernel/geom/geom_triangle_intersect.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h index 970616eb894..9cc31ca8508 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, -- cgit v1.2.3