[Bf-blender-cvs] [41eba47a877] master: Revert "Cycles: optimize volume stack copying for shadow catcher/compaction"

[Brecht Van Lommel]

Commit: 41eba47a877e3420246dfe2971eb6bbba2e39a17
Author: Brecht Van Lommel
Date:   Mon Oct 18 22:34:09 2021 +0200
Branches: master
https://developer.blender.org/rB41eba47a877e3420246dfe2971eb6bbba2e39a17

Revert "Cycles: optimize volume stack copying for shadow catcher/compaction"

This reverts commit 3065d2609700d14100490a16c91152a6e71790e8. Causing crashes
in the spring scene.

===================================================================

M	intern/cycles/kernel/integrator/integrator_state_util.h

===================================================================

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,