diff options
author | Thomas Dinges <blender@dingto.org> | 2016-01-07 01:38:13 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2016-01-07 01:43:29 +0300 |
commit | 83e73a2100688655f0eb2df5cbfac2ca1f051fff (patch) | |
tree | 76f1cd502187544777b61fa55f5695b2503993a8 /intern/cycles/kernel/split/kernel_data_init.h | |
parent | be28706bacfb95e7c3c1b58b183acda0e35977f8 (diff) |
Cycles: Refactor how we pass bounce info to light path node.
This commit changes the way how we pass bounce information to the Light
Path node. Instead of manualy copying the bounces into ShaderData, we now
directly pass PathState. This reduces the arguments that we need to pass
around and also makes it easier to extend the feature.
This commit also exposes the Transmission Bounce Depth to the Light Path
node. It works similar to the Transparent Depth Output: Replace a
Transmission lightpath after X bounces with another shader, e.g a Diffuse
one. This can be used to avoid black surfaces, due to low amount of max
bounces.
Reviewed by Sergey and Brecht, thanks for some hlp with this.
I tested compilation and usage on CPU (SVM and OSL), CUDA, OpenCL Split
and Mega kernel. Hopefully this covers all devices. :)
Diffstat (limited to 'intern/cycles/kernel/split/kernel_data_init.h')
-rw-r--r-- | intern/cycles/kernel/split/kernel_data_init.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/intern/cycles/kernel/split/kernel_data_init.h b/intern/cycles/kernel/split/kernel_data_init.h index a5db6a83283..27defe2fb9a 100644 --- a/intern/cycles/kernel/split/kernel_data_init.h +++ b/intern/cycles/kernel/split/kernel_data_init.h @@ -94,12 +94,6 @@ ccl_device void kernel_data_init( ccl_global float *ray_length_sd, ccl_global float *ray_length_sd_DL_shadow, - ccl_global int *ray_depth_sd, - ccl_global int *ray_depth_sd_DL_shadow, - - ccl_global int *transparent_depth_sd, - ccl_global int *transparent_depth_sd_DL_shadow, - /* Ray differentials. */ ccl_global differential3 *dP_sd, ccl_global differential3 *dP_sd_DL_shadow, @@ -219,12 +213,6 @@ ccl_device void kernel_data_init( sd->ray_length = ray_length_sd; sd_DL_shadow->ray_length = ray_length_sd_DL_shadow; - sd->ray_depth = ray_depth_sd; - sd_DL_shadow->ray_depth = ray_depth_sd_DL_shadow; - - sd->transparent_depth = transparent_depth_sd; - sd_DL_shadow->transparent_depth = transparent_depth_sd_DL_shadow; - #ifdef __RAY_DIFFERENTIALS__ sd->dP = dP_sd; sd_DL_shadow->dP = dP_sd_DL_shadow; |