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_direct_lighting.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_direct_lighting.h')
| -rw-r--r-- | intern/cycles/kernel/split/kernel_direct_lighting.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/intern/cycles/kernel/split/kernel_direct_lighting.h b/intern/cycles/kernel/split/kernel_direct_lighting.h index 20d1728f9de..c7a2aa6426c 100644 --- a/intern/cycles/kernel/split/kernel_direct_lighting.h +++ b/intern/cycles/kernel/split/kernel_direct_lighting.h @@ -36,7 +36,6 @@ * kg (globals) -------------------------------------| | * queuesize ----------------------------------------| | * - * note on sd_DL : sd_DL is neither input nor output to this kernel; sd_DL is filled and consumed in this kernel itself. * Note on Queues : * This kernel only reads from the QUEUE_ACTIVE_AND_REGENERATED_RAYS queue and processes * only the rays of state RAY_ACTIVE; If a ray needs to execute the corresponding shadow_blocked @@ -51,7 +50,6 @@ ccl_device char kernel_direct_lighting( KernelGlobals *kg, ShaderData *sd, /* Required for direct lighting */ - ShaderData *sd_DL, /* Required for direct lighting */ ccl_global uint *rng_coop, /* Required for direct lighting */ ccl_global PathState *PathState_coop, /* Required for direct lighting */ ccl_global int *ISLamp_coop, /* Required for direct lighting */ @@ -90,9 +88,7 @@ ccl_device char kernel_direct_lighting( BsdfEval L_light; bool is_lamp; - if(direct_emission(kg, sd, &ls, state, &light_ray, &L_light, &is_lamp, - sd_DL)) - { + if(direct_emission(kg, sd, &ls, state, &light_ray, &L_light, &is_lamp)) { /* Write intermediate data to global memory to access from * the next kernel. */ |