From 41eba47a877e3420246dfe2971eb6bbba2e39a17 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 18 Oct 2021 22:34:09 +0200 Subject: [PATCH] Revert "Cycles: optimize volume stack copying for shadow catcher/compaction" This reverts commit 3065d2609700d14100490a16c91152a6e71790e8. Causing crashes in the spring scene. --- intern/cycles/kernel/integrator/integrator_state_util.h | 5 +---- 1 file changed, 1 insertion(+), 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,