[Bf-blender-cvs] [1b31966] master: Cycles: Workaround cuda 6.5 compiler bug with sm_50

[Sergey Sharybin]

Commit: 1b319669d0cce4eef418473dcbbfd00071a95308
Author: Sergey Sharybin
Date:   Sat Sep 6 15:10:17 2014 +0600
Branches: master
https://developer.blender.org/rB1b319669d0cce4eef418473dcbbfd00071a95308

Cycles: Workaround cuda 6.5 compiler bug with sm_50

===================================================================

M	intern/cycles/kernel/kernel_accumulate.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_accumulate.h b/intern/cycles/kernel/kernel_accumulate.h
index 4f759b3..b0efcdc 100644
--- a/intern/cycles/kernel/kernel_accumulate.h
+++ b/intern/cycles/kernel/kernel_accumulate.h
@@ -54,7 +54,13 @@ ccl_device_inline void bsdf_eval_init(BsdfEval *eval, ClosureType type, float3 v
 #endif
 }
 
-ccl_device_inline void bsdf_eval_accum(BsdfEval *eval, ClosureType type, float3 value)
+/* TODO(sergey): This is just a workaround for annoying 6.5 compiler bug. */
+#if !defined(__KERNEL_CUDA__) || __CUDA_ARCH__ < 500
+ccl_device_inline
+#else
+ccl_device_noinline
+#endif
+void bsdf_eval_accum(BsdfEval *eval, ClosureType type, float3 value)
 {
 #ifdef __PASSES__
 	if(eval->use_light_pass) {