Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 3065d26097. Causing crashes
in the spring scene.
This commit is contained in:
Brecht Van Lommel
2021-10-18 22:34:09 +02:00
parent 06356115b7
commit 41eba47a87
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/kernel/integrator/integrator_state_util.h
View File

@@ -240,8 +240,7 @@ ccl_device_inline void integrator_state_copy_only(KernelGlobals kg,
while (index < gpu_array_size) \ 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 kernel_data.volume_stack_size
# define KERNEL_STRUCT_VOLUME_STACK_SIZE 0
# include "kernel/integrator/integrator_state_template.h" # 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
# undef KERNEL_STRUCT_END_ARRAY # undef KERNEL_STRUCT_END_ARRAY
# undef KERNEL_STRUCT_VOLUME_STACK_SIZE # undef KERNEL_STRUCT_VOLUME_STACK_SIZE
integrator_state_copy_volume_stack(kg, to_state, state);
} }
ccl_device_inline void integrator_state_move(KernelGlobals kg, ccl_device_inline void integrator_state_move(KernelGlobals kg,