[Bf-blender-cvs] [72e31d6] master: Cycles: Always inline triangle precalc for CUDA devices

[Sergey Sharybin]

Commit: 72e31d6a7292ccd827a52afe351ffe89f31739f8
Author: Sergey Sharybin
Date:   Mon Jan 11 21:40:12 2016 +0500
Branches: master
https://developer.blender.org/rB72e31d6a7292ccd827a52afe351ffe89f31739f8

Cycles: Always inline triangle precalc for CUDA devices

Since the SSS changes compiling Experimental sm_52 kernel seems
to work just fine.

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

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 5947945..35f2d90 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -50,19 +50,7 @@ typedef struct IsectPrecalc {
 } 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
-#    else
 ccl_device_inline
-#    endif
-#  endif  /* (defined(i386) || defined(_M_IX86)) */
 #elif defined(__KERNEL_OPENCL_APPLE__)
 ccl_device_noinline
 #else  /* defined(__KERNEL_OPENCL_APPLE__) */