diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2021-10-24 15:31:22 +0300 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2021-10-24 15:31:22 +0300 |
| commit | 1aa953bd1913c81b22c80a00edbf4ad88a32c52f (patch) | |
| tree | 7fa65e43d5a9bac6496555b723f37e0031e2737e /intern/cycles/kernel/closure/bsdf_microfacet_multi.h | |
| parent | fc171c1be9da36485e892339b86dc8d4251914af (diff) | |
| parent | 6ce383a9dfba5c49a48676c3a651804fde3dfe34 (diff) | |
Merge branch 'master' into soc-2020-io-performance
Diffstat (limited to 'intern/cycles/kernel/closure/bsdf_microfacet_multi.h')
| -rw-r--r-- | intern/cycles/kernel/closure/bsdf_microfacet_multi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h index 6ee1139ddbb..b7bd7faaa54 100644 --- a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h +++ b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h @@ -476,7 +476,7 @@ ccl_device float3 bsdf_microfacet_multi_ggx_eval_reflect(ccl_private const Shade bsdf->extra->cspec0); } -ccl_device int bsdf_microfacet_multi_ggx_sample(ccl_global const KernelGlobals *kg, +ccl_device int bsdf_microfacet_multi_ggx_sample(KernelGlobals kg, ccl_private const ShaderClosure *sc, float3 Ng, float3 I, @@ -639,7 +639,7 @@ ccl_device float3 bsdf_microfacet_multi_ggx_glass_eval_reflect(ccl_private const bsdf->extra->cspec0); } -ccl_device int bsdf_microfacet_multi_ggx_glass_sample(ccl_global const KernelGlobals *kg, +ccl_device int bsdf_microfacet_multi_ggx_glass_sample(KernelGlobals kg, ccl_private const ShaderClosure *sc, float3 Ng, float3 I, |