diff options
| author | Sergey Sharybin <sergey@blender.org> | 2021-11-10 19:18:55 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2021-11-11 17:21:35 +0300 |
| commit | d26d3cfe193793728cac77be9b44463a84a0f57e (patch) | |
| tree | bd949dffbe4e8476f008dcd855a941bd9e030a28 /intern/cycles/kernel/device/cpu | |
| parent | 9be6880d020eb2a6891c07e0b8794400f20f5464 (diff) | |
Fix T92868: Cycles catcher with transparency crashes
The issue was caused by splitting happening twice.
Fixed by checking for split flag which is assigned to the both states
during split.
The tricky part was to write catcher data at the moment of split: the
transparency and shadow catcher sample count is to be accumulated at
that point. Now it is happening in the `intersect_closest` kernel.
The downside is that render buffer is to be passed to the kernel, but
the benefit is that extra split bounce check is not needed now.
Had to move the passes write to shadow catcher header, since include
of `film/passes.h` causes all the fun of requirement to have BSDF
data structures available.
Differential Revision: https://developer.blender.org/D13177
Diffstat (limited to 'intern/cycles/kernel/device/cpu')
| -rw-r--r-- | intern/cycles/kernel/device/cpu/kernel_arch.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/device/cpu/kernel_arch_impl.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/device/cpu/kernel_arch.h b/intern/cycles/kernel/device/cpu/kernel_arch.h index 2f9a3f7c59d..61f62f3136b 100644 --- a/intern/cycles/kernel/device/cpu/kernel_arch.h +++ b/intern/cycles/kernel/device/cpu/kernel_arch.h @@ -37,7 +37,7 @@ KERNEL_INTEGRATOR_INIT_FUNCTION(init_from_camera); KERNEL_INTEGRATOR_INIT_FUNCTION(init_from_bake); -KERNEL_INTEGRATOR_FUNCTION(intersect_closest); +KERNEL_INTEGRATOR_SHADE_FUNCTION(intersect_closest); KERNEL_INTEGRATOR_FUNCTION(intersect_shadow); KERNEL_INTEGRATOR_FUNCTION(intersect_subsurface); KERNEL_INTEGRATOR_FUNCTION(intersect_volume_stack); diff --git a/intern/cycles/kernel/device/cpu/kernel_arch_impl.h b/intern/cycles/kernel/device/cpu/kernel_arch_impl.h index 1ea5002e300..747c47c34c9 100644 --- a/intern/cycles/kernel/device/cpu/kernel_arch_impl.h +++ b/intern/cycles/kernel/device/cpu/kernel_arch_impl.h @@ -112,7 +112,7 @@ CCL_NAMESPACE_BEGIN DEFINE_INTEGRATOR_INIT_KERNEL(init_from_camera) DEFINE_INTEGRATOR_INIT_KERNEL(init_from_bake) -DEFINE_INTEGRATOR_KERNEL(intersect_closest) +DEFINE_INTEGRATOR_SHADE_KERNEL(intersect_closest) DEFINE_INTEGRATOR_KERNEL(intersect_subsurface) DEFINE_INTEGRATOR_KERNEL(intersect_volume_stack) DEFINE_INTEGRATOR_SHADE_KERNEL(shade_background) |