Commit: 34d665a4a4bc710aff6b29543bb3a8ea796366f4
Author: Sergey Sharybin
Date: Sat Jun 20 18:00:30 2015 +0200
Branches: master
https://developer.blender.org/rB34d665a4a4bc710aff6b29543bb3a8ea796366f4
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.
===================================================================
M intern/cycles/kernel/geom/geom_triangle_intersect.h
===================================================================
diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h
b/intern/cycles/kernel/geom/geom_triangle_intersect.h
index 5f41012..2b7f4d7 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)
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
