diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-21 12:29:09 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-21 13:32:32 +0300 |
| commit | a283333cd8eaaa163469ecbc1d878cd4e82217de (patch) | |
| tree | ae4a08059087345a411aa0b0c8c74415cf418643 /intern/cycles/kernel/closure/bsdf.h | |
| parent | d6313f47af8aa0156fa3beffad71cd689eadf397 (diff) | |
Fix Cycles CUDA render errors with CUDA 9.2.
Work around what might be a compiler bug.
Diffstat (limited to 'intern/cycles/kernel/closure/bsdf.h')
| -rw-r--r-- | intern/cycles/kernel/closure/bsdf.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/intern/cycles/kernel/closure/bsdf.h b/intern/cycles/kernel/closure/bsdf.h index d8ff69ca241..c1b02cd4be1 100644 --- a/intern/cycles/kernel/closure/bsdf.h +++ b/intern/cycles/kernel/closure/bsdf.h @@ -72,15 +72,15 @@ ccl_device_inline float bsdf_get_roughness_squared(const ShaderClosure *sc) return bsdf_get_specular_roughness_squared(sc); } -ccl_device_forceinline int bsdf_sample(KernelGlobals *kg, - ShaderData *sd, - const ShaderClosure *sc, - float randu, - float randv, - float3 *eval, - float3 *omega_in, - differential3 *domega_in, - float *pdf) +ccl_device_inline int bsdf_sample(KernelGlobals *kg, + ShaderData *sd, + const ShaderClosure *sc, + float randu, + float randv, + float3 *eval, + float3 *omega_in, + differential3 *domega_in, + float *pdf) { int label; @@ -210,7 +210,7 @@ ccl_device_forceinline int bsdf_sample(KernelGlobals *kg, #ifndef __KERNEL_CUDA__ ccl_device #else -ccl_device_forceinline +ccl_device_inline #endif float3 bsdf_eval(KernelGlobals *kg, ShaderData *sd, |