diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-03-16 09:16:02 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-03-17 08:54:04 +0300 |
| commit | 60a344b43d19524d5c97c6c19efd5c628b5bbbe1 (patch) | |
| tree | b6a8c19ebdf7da4075f4d0c3e55e5a1b9abfbb1b /intern/cycles/kernel/split/kernel_subsurface_scatter.h | |
| parent | b27e2242768ca39bd832e95a385d3e4ad802059e (diff) | |
Cycles: Fix handling of barriers
Diffstat (limited to 'intern/cycles/kernel/split/kernel_subsurface_scatter.h')
| -rw-r--r-- | intern/cycles/kernel/split/kernel_subsurface_scatter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/split/kernel_subsurface_scatter.h b/intern/cycles/kernel/split/kernel_subsurface_scatter.h index 709a296c9a0..4eaa7f56332 100644 --- a/intern/cycles/kernel/split/kernel_subsurface_scatter.h +++ b/intern/cycles/kernel/split/kernel_subsurface_scatter.h @@ -46,12 +46,12 @@ ccl_device void kernel_subsurface_scatter(KernelGlobals *kg, } #endif + char enqueue_flag = 0; + #ifndef __COMPUTE_DEVICE_GPU__ if(ray_index != QUEUE_EMPTY_SLOT) { #endif - - char enqueue_flag = 0; ccl_global char *ray_state = kernel_split_state.ray_state; ccl_global PathState *state = &kernel_split_state.path_state[ray_index]; PathRadiance *L = &kernel_split_state.path_radiance[ray_index]; |