From b83d8519012940e9b344cdca7154d575e5a433c4 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 9 Feb 2015 16:11:58 +0500 Subject: 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. --- intern/cycles/kernel/geom/geom_triangle_intersect.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles') 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 -- cgit v1.2.3