diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-01 21:00:42 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-05 20:13:44 +0300 |
| commit | 2c02a04c464c2f5c6e211ceb7b21255eaca7e087 (patch) | |
| tree | 005c4b99ecf43db7513e9b5c2dfcaca56e1608a1 /intern/cycles/kernel/kernel_path.h | |
| parent | cac3d4d16691d77e8e01f158be07d182e56e9755 (diff) | |
Code refactor: remove emission and background closures, sum directly.
Diffstat (limited to 'intern/cycles/kernel/kernel_path.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_path.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h index e664a2e9dbd..1099064038b 100644 --- a/intern/cycles/kernel/kernel_path.h +++ b/intern/cycles/kernel/kernel_path.h @@ -132,7 +132,7 @@ ccl_device_forceinline void kernel_path_background( ccl_addr_space PathState *state, ccl_addr_space Ray *ray, float3 throughput, - ShaderData *emission_sd, + ShaderData *sd, PathRadiance *L) { /* eval background shader if nothing hit */ @@ -153,7 +153,7 @@ ccl_device_forceinline void kernel_path_background( #ifdef __BACKGROUND__ /* sample background shader */ - float3 L_background = indirect_background(kg, emission_sd, state, ray); + float3 L_background = indirect_background(kg, sd, state, ray); path_radiance_accum_background(L, state, throughput, L_background); #endif /* __BACKGROUND__ */ } @@ -407,7 +407,7 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg, bool hit = kernel_path_scene_intersect(kg, state, ray, &isect, L); /* Find intersection with lamps and compute emission for MIS. */ - kernel_path_lamp_emission(kg, state, ray, throughput, &isect, emission_sd, L); + kernel_path_lamp_emission(kg, state, ray, throughput, &isect, sd, L); #ifdef __VOLUME__ /* Volume integration. */ @@ -431,7 +431,7 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg, /* Shade background. */ if(!hit) { - kernel_path_background(kg, state, ray, throughput, emission_sd, L); + kernel_path_background(kg, state, ray, throughput, sd, L); break; } else if(path_state_ao_bounce(kg, state)) { |