[Bf-blender-cvs] [470cc98] master: Cycles: Fix/workaround for wrong/noise render results with GCC6
Sergey Sharybin
noreply at git.blender.org
Fri Aug 5 11:56:24 CEST 2016
Commit: 470cc989459bc7723e7cd9a4358ae35c093dd54b
Author: Sergey Sharybin
Date: Fri Aug 5 10:48:38 2016 +0200
Branches: master
https://developer.blender.org/rB470cc989459bc7723e7cd9a4358ae35c093dd54b
Cycles: Fix/workaround for wrong/noise render results with GCC6
===================================================================
M intern/cycles/kernel/kernel_subsurface.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_subsurface.h b/intern/cycles/kernel/kernel_subsurface.h
index 4477a9f..5e2754b 100644
--- 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
More information about the Bf-blender-cvs
mailing list