diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-11 19:40:12 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-11 19:41:00 +0300 |
| commit | 72e31d6a7292ccd827a52afe351ffe89f31739f8 (patch) | |
| tree | fb3781cc312dcfa2cc859eae73b53e31c1a1db3a /intern | |
| parent | a60c3c6b21b835ab9160becd4bded0573e1b23a9 (diff) | |
Cycles: Always inline triangle precalc for CUDA devices
Since the SSS changes compiling Experimental sm_52 kernel seems
to work just fine.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_triangle_intersect.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h index 5947945ccc6..35f2d905da0 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__) */ |