Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-02-02 15:06:15 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-02-02 15:35:57 +0300
commit31263192bbb97e97d7e9674c7d90fa209718be4b (patch)
tree880691e6ac54fb421f06347b1b0953014c9f133b /intern/cycles
parent81f97692ae8d364dfc23d9bab617502ebf3e90b2 (diff)
Fix T43511: Major slow down with many instanced objects in cycles GPU
Slowdown was caused by watertight intersection commit and follow-up workaorund for compiler crash which uninlined utility function which rotates the ray. Now it's only uninlined for sm_50 and sm_52 experimental kernels which are the only ones which failed to compile. Rendering still might be a bit slower but at least shouldn't be that dramatic.
Diffstat (limited to 'intern/cycles')
-rw-r--r--intern/cycles/kernel/geom/geom_triangle_intersect.h2
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 bd5861d018e..329b18f516a 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -50,7 +50,7 @@ typedef struct IsectPrecalc {
} IsectPrecalc;
/* Workaround for CUDA toolkit 6.5.16. */
-#ifdef __KERNEL_CPU__
+#if defined(__KERNEL_CPU__) || !defined(__KERNEL_CUDA_EXPERIMENTAL__) || __CUDA_ARCH__ < 500
ccl_device_inline
#else
ccl_device_noinline