diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-11-27 15:12:44 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-11-27 15:15:02 +0300 |
| commit | 20fc9c00fddeabc524ba91815108e52edd85ce4b (patch) | |
| tree | 1601a0bbbf6d13fd68597d919c130f289290c9e2 /intern/cycles/kernel/kernel_bake.h | |
| parent | 175f00c89a88056b5307ec385968333c9327b63f (diff) | |
Cycles: Fully roll-back to non-delayed SSS indirect rays for CPU
There are some issues to be solved with the recent optimization we did for
the indirect rays for the SSS. Those issues will take a bit of a time to
be fully solved still and we need to unlock Caminandes team now, so let's
revert some changes back.
CUDA will still use delayed indirect rays since it's an experimental
feature.
For the details about what's to be done still please refer to T46880.
Diffstat (limited to 'intern/cycles/kernel/kernel_bake.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_bake.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_bake.h b/intern/cycles/kernel/kernel_bake.h index 3efd7ecca5f..e9cf02caaf3 100644 --- a/intern/cycles/kernel/kernel_bake.h +++ b/intern/cycles/kernel/kernel_bake.h @@ -74,6 +74,7 @@ ccl_device void compute_light_pass(KernelGlobals *kg, ShaderData *sd, PathRadian &throughput, &ss_indirect)) { +# ifdef __SUBSURFACE_DELAYED_INDIRECT__ while(ss_indirect.num_rays) { kernel_path_subsurface_setup_indirect(kg, &ss_indirect, @@ -90,6 +91,7 @@ ccl_device void compute_light_pass(KernelGlobals *kg, ShaderData *sd, PathRadian &state, &L_sample); } +# endif /* __SUBSURFACE_DELAYED_INDIRECT__ */ is_sss_sample = true; } } |