diff options
| author | Hristo Gueorguiev <prem.nirved@gmail.com> | 2017-03-08 17:42:26 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-09 19:09:37 +0300 |
| commit | 57e26627c485baab63e108821b2712d5e234ae7c (patch) | |
| tree | e3ee5aa4bf759121559c69504b77d600552bf527 /intern/cycles/kernel/split/kernel_queue_enqueue.h | |
| parent | 6c942db30dee14eb37229879656fa049a9ac6df6 (diff) | |
Cycles: SSS and Volume rendering in split kernel
Decoupled ray marching is not supported yet.
Transparent shadows are always enabled for volume rendering.
Changes in kernel/bvh and kernel/geom are from Sergey.
This simiplifies code significantly, and prepares it for
record-all transparent shadow function in split kernel.
Diffstat (limited to 'intern/cycles/kernel/split/kernel_queue_enqueue.h')
| -rw-r--r-- | intern/cycles/kernel/split/kernel_queue_enqueue.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/kernel/split/kernel_queue_enqueue.h b/intern/cycles/kernel/split/kernel_queue_enqueue.h index 66aad705bd4..70ec92b394b 100644 --- a/intern/cycles/kernel/split/kernel_queue_enqueue.h +++ b/intern/cycles/kernel/split/kernel_queue_enqueue.h @@ -63,10 +63,12 @@ ccl_device void kernel_queue_enqueue(KernelGlobals *kg) int queue_number = -1; - if(IS_STATE(kernel_split_state.ray_state, ray_index, RAY_HIT_BACKGROUND)) { + if(IS_STATE(kernel_split_state.ray_state, ray_index, RAY_HIT_BACKGROUND) || + IS_STATE(kernel_split_state.ray_state, ray_index, RAY_UPDATE_BUFFER)) { queue_number = QUEUE_HITBG_BUFF_UPDATE_TOREGEN_RAYS; } - else if(IS_STATE(kernel_split_state.ray_state, ray_index, RAY_ACTIVE)) { + else if(IS_STATE(kernel_split_state.ray_state, ray_index, RAY_ACTIVE) || + IS_STATE(kernel_split_state.ray_state, ray_index, RAY_REGENERATED)) { queue_number = QUEUE_ACTIVE_AND_REGENERATED_RAYS; } |