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_data_init.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_data_init.h')
-rw-r--r-- | intern/cycles/kernel/split/kernel_data_init.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/kernel/split/kernel_data_init.h b/intern/cycles/kernel/split/kernel_data_init.h index 27defe2fb9a..6993a78a789 100644 --- a/intern/cycles/kernel/split/kernel_data_init.h +++ b/intern/cycles/kernel/split/kernel_data_init.h @@ -145,6 +145,7 @@ ccl_device void kernel_data_init( PathRadiance *PathRadiance_coop, /* PathRadiance array to store PathRadiance values for all rays */ ccl_global Ray *Ray_coop, /* Ray array to store Ray information for all rays */ ccl_global PathState *PathState_coop, /* PathState array to store PathState information for all rays */ + Intersection *Intersection_coop_shadow, ccl_global char *ray_state, /* Stores information on current state of a ray */ #define KERNEL_TEX(type, ttype, name) \ @@ -170,6 +171,8 @@ ccl_device void kernel_data_init( int parallel_samples) /* Number of samples to be processed in parallel */ { kg->data = data; + kg->sd_input = sd_DL_shadow; + kg->isect_shadow = Intersection_coop_shadow; #define KERNEL_TEX(type, ttype, name) \ kg->name = name; #include "../kernel_textures.h" |