diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-02-02 20:08:01 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-02-02 20:09:02 +0300 |
| commit | 432e478f4399f7833817431769b6136c7adf1ae8 (patch) | |
| tree | 80d67833287942264a1ee6732dd8db9941769040 /intern | |
| parent | 30e4009f0a5e7738ea6851b76b5a85e5d5f19710 (diff) | |
Cycles: Further tweaks to T43511 to solve compilation error on 32bit platforms
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_triangle_intersect.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h index 329b18f516a..1465aa356da 100644 --- a/intern/cycles/kernel/geom/geom_triangle_intersect.h +++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h @@ -51,7 +51,11 @@ typedef struct IsectPrecalc { /* Workaround for CUDA toolkit 6.5.16. */ #if defined(__KERNEL_CPU__) || !defined(__KERNEL_CUDA_EXPERIMENTAL__) || __CUDA_ARCH__ < 500 +# if (defined(i386) || defined(_M_IX86)) && (__CUDA_ARCH__ > 500) +ccl_device_noinline +# else ccl_device_inline +# endif #else ccl_device_noinline #endif |