diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-10-12 13:15:24 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-10-12 13:15:24 +0300 |
| commit | 87d08a5dc183c9d5025433be137970423c4824e7 (patch) | |
| tree | 8d825f2ebd78063e4d5e518c00a12cedda8a19cd /intern/cycles/kernel/kernel_subsurface.h | |
| parent | cc951726673e0e7e9969ce83f90efdabde289791 (diff) | |
Cycles: Get rid of ifdef-ed noinline policy
Diffstat (limited to 'intern/cycles/kernel/kernel_subsurface.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_subsurface.h | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/intern/cycles/kernel/kernel_subsurface.h b/intern/cycles/kernel/kernel_subsurface.h index 955aa8a346f..52c05b85aee 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_noinline -#else -ccl_device_inline -#endif -float3 subsurface_scatter_eval(ShaderData *sd, - ShaderClosure *sc, - float disk_r, - float r, - bool all) +ccl_device_inline 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 @@ -223,12 +218,7 @@ ccl_device void subsurface_color_bump_blur(KernelGlobals *kg, /* Subsurface scattering step, from a point on the surface to other * nearby points on the same object. */ -#ifndef __KERNEL_CUDA__ -ccl_device -#else -ccl_device_inline -#endif -int subsurface_scatter_multi_intersect( +ccl_device_inline int subsurface_scatter_multi_intersect( KernelGlobals *kg, SubsurfaceIntersection *ss_isect, ShaderData *sd, |