diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-08-02 16:04:34 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-08-02 16:13:34 +0300 |
| commit | 500e0e9a3d5a9e7982d4df31a1477b8732c76e71 (patch) | |
| tree | 92a4f5f1559143efdfeb2b087549c587477bba25 /intern/cycles/kernel/closure/bsdf.h | |
| parent | b416168d85a7cf5a27370f5c933fd1ad41ee333d (diff) | |
Cycles: Some more inline policy tweaks for CUDA 8
Makes it so toolkit does exactly the same decision about what to inline,
but unfortunately it has really barely visible difference on GTX-980.
Diffstat (limited to 'intern/cycles/kernel/closure/bsdf.h')
| -rw-r--r-- | intern/cycles/kernel/closure/bsdf.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/intern/cycles/kernel/closure/bsdf.h b/intern/cycles/kernel/closure/bsdf.h index 55bdf3ecbb4..86e1a7f317f 100644 --- a/intern/cycles/kernel/closure/bsdf.h +++ b/intern/cycles/kernel/closure/bsdf.h @@ -144,7 +144,16 @@ ccl_device_inline int bsdf_sample(KernelGlobals *kg, return label; } -ccl_device float3 bsdf_eval(KernelGlobals *kg, ShaderData *sd, const ShaderClosure *sc, const float3 omega_in, float *pdf) +#ifndef __KERNEL_CUDS__ +ccl_device +#else +ccl_device_inline +#endif +float3 bsdf_eval(KernelGlobals *kg, + ShaderData *sd, + const ShaderClosure *sc, + const float3 omega_in, + float *pdf) { float3 eval; |