Cycles: Fix/workaround for wrong/noise render results with GCC6

2016-08-05 10:48:38 +02:00 · 2016-08-05 10:48:38 +02:00 · 470cc98945
commit 470cc98945
parent a8b3ff9e16
1 changed files with 5 additions and 10 deletions
--- a/intern/cycles/kernel/kernel_subsurface.h
+++ b/intern/cycles/kernel/kernel_subsurface.h
@ -85,16 +85,11 @@ ccl_device ShaderClosure *subsurface_scatter_pick_closure(KernelGlobals *kg, Sha
 	return NULL;
 }

-#ifndef __KERNEL_GPU__
-ccl_device
-#else
-ccl_device_inline
-#endif
-float3 subsurface_scatter_eval(ShaderData *sd,
-                               ShaderClosure *sc,
-                               float disk_r,
-                               float r,
-                               bool all)
+ccl_device_noinline float3 subsurface_scatter_eval(ShaderData *sd,
+                                                   ShaderClosure *sc,
+                                                   float disk_r,
+                                                   float r,
+                                                   bool all)
 {
 #ifdef BSSRDF_MULTI_EVAL
 	/* this is the veach one-sample model with balance heuristic, some pdf