diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-10-18 23:34:09 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-10-18 23:38:33 +0300 |
| commit | 41eba47a877e3420246dfe2971eb6bbba2e39a17 (patch) | |
| tree | 8ff818dce3d3ae77c4c4aecc850fa1c81d09754d /intern | |
| parent | 06356115b71fb0668b0b67735f92ba6660434a96 (diff) | |
Revert "Cycles: optimize volume stack copying for shadow catcher/compaction"
This reverts commit 3065d2609700d14100490a16c91152a6e71790e8. Causing crashes
in the spring scene.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/integrator/integrator_state_util.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/intern/cycles/kernel/integrator/integrator_state_util.h b/intern/cycles/kernel/integrator/integrator_state_util.h index 18dcdff12ad..dacc21e6eeb 100644 --- a/intern/cycles/kernel/integrator/integrator_state_util.h +++ b/intern/cycles/kernel/integrator/integrator_state_util.h @@ -240,8 +240,7 @@ ccl_device_inline void integrator_state_copy_only(KernelGlobals kg, while (index < gpu_array_size) \ ; -/* Don't copy volume stack here, do it after with just the number of items needed. */ -# define KERNEL_STRUCT_VOLUME_STACK_SIZE 0 +# define KERNEL_STRUCT_VOLUME_STACK_SIZE kernel_data.volume_stack_size # include "kernel/integrator/integrator_state_template.h" @@ -251,8 +250,6 @@ ccl_device_inline void integrator_state_copy_only(KernelGlobals kg, # undef KERNEL_STRUCT_END # undef KERNEL_STRUCT_END_ARRAY # undef KERNEL_STRUCT_VOLUME_STACK_SIZE - - integrator_state_copy_volume_stack(kg, to_state, state); } ccl_device_inline void integrator_state_move(KernelGlobals kg, |