diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-02-09 14:11:58 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-02-09 14:14:44 +0300 |
| commit | b83d8519012940e9b344cdca7154d575e5a433c4 (patch) | |
| tree | c40719945629fd98cc21c93a35ecca42cfbe4654 /intern/cycles | |
| parent | 5544ded2b513a41caa1673aea3dfbbc5b56380be (diff) | |
Cycles: Another attempt to solve 32bit CUDA kernel
Previous fix didn't quite work well. For some reason everything worked fine when
using native nvcc in 32bit environment, but cross-compiling from 64bit platform
it was still running out of memory.
For now just made it so all the kernels are slower on 32bit CUDA as a temporary
solution. Either it'll be solved in next CUDA releases (by dropped 32bit? =\) or
we'll find better workaround.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_triangle_intersect.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h index 6f8c3e3e76c..30468efff91 100644 --- a/intern/cycles/kernel/geom/geom_triangle_intersect.h +++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h @@ -51,7 +51,7 @@ 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) +# if (defined(i386) || defined(_M_IX86)) ccl_device_noinline # else ccl_device_inline |