From 34d665a4a4bc710aff6b29543bb3a8ea796366f4 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sat, 20 Jun 2015 18:00:30 +0200 Subject: [PATCH] Cycles: Un-inline triangle_intersect_precalc() on Apple OpenCL This gives quite the same problems as experimental CUDA kernels and for until it's found a root cause of the problem we'd just explicitly uninline the function. --- intern/cycles/kernel/geom/geom_triangle_intersect.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h index 5f41012bf30..2b7f4d7431f 100644 --- a/intern/cycles/kernel/geom/geom_triangle_intersect.h +++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h @@ -63,9 +63,11 @@ ccl_device_noinline ccl_device_inline # endif # endif /* (defined(i386) || defined(_M_IX86)) */ -#else /* defined(__KERNEL_CUDA__) */ +#elif defined(__KERNEL_OPENCL_APPLE__) +ccl_device_noinline +#else /* defined(__KERNEL_OPENCL_APPLE__) */ ccl_device_inline -#endif /* defined(__KERNEL_CUDA__) */ +#endif /* defined(__KERNEL_OPENCL_APPLE__) */ void triangle_intersect_precalc(float3 dir, IsectPrecalc *isect_precalc) {