diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-14 17:58:22 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-28 20:59:27 +0300 |
| commit | e2161ca854da03bae8c17c7cfac6dbcd9d62f33b (patch) | |
| tree | 6e5a2e0afc4fca9ae226dce79caefad82cc5b07a /intern/cycles/kernel/split/kernel_lamp_emission.h | |
| parent | 53ef03d20f5ce1dc0c6cb49c759f0be3f467340f (diff) | |
Cycles: Remove few function arguments needed only for the split kernel
Use KernelGlobals to access all the global arrays for the intermediate
storage instead of passing all this storage things explicitly.
Tested here with Intel OpenCL, NVIDIA GTX580 and AMD Fiji, didn't see
any artifacts, so guess it's all good.
Reviewers: juicyfruit, dingto, lukasstockner97
Differential Revision: https://developer.blender.org/D1736
Diffstat (limited to 'intern/cycles/kernel/split/kernel_lamp_emission.h')
| -rw-r--r-- | intern/cycles/kernel/split/kernel_lamp_emission.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/intern/cycles/kernel/split/kernel_lamp_emission.h b/intern/cycles/kernel/split/kernel_lamp_emission.h index 6329f3ae943..b651f79d536 100644 --- a/intern/cycles/kernel/split/kernel_lamp_emission.h +++ b/intern/cycles/kernel/split/kernel_lamp_emission.h @@ -36,12 +36,9 @@ * sw -------------------------------------------------| | * sh -------------------------------------------------| | * parallel_samples -----------------------------------| | - * - * note : sd is neither input nor output. Its just filled and consumed in the same, kernel_lamp_emission, kernel. */ ccl_device void kernel_lamp_emission( KernelGlobals *kg, - ShaderData *sd, /* Required for lamp emission */ ccl_global float3 *throughput_coop, /* Required for lamp emission */ PathRadiance *PathRadiance_coop, /* Required for lamp emission */ ccl_global Ray *Ray_coop, /* Required for lamp emission */ @@ -79,7 +76,7 @@ ccl_device void kernel_lamp_emission( /* intersect with lamp */ float3 emission; - if(indirect_lamp_emission(kg, state, &light_ray, &emission, sd)) { + if(indirect_lamp_emission(kg, state, &light_ray, &emission)) { path_radiance_accum_emission(L, throughput, emission, state->bounce); } } |