diff options
author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-03-01 09:05:55 +0300 |
---|---|---|
committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-03-08 09:30:43 +0300 |
commit | 4cf501b83557ed5d64dbd2ddb13e1e8c5add88f5 (patch) | |
tree | 9f142597016bae22e73137aeeaf4d8107af3d8c8 /intern/cycles/kernel/kernels/cpu | |
parent | 5b8f1c8d342274e08d1a489b655ca4138eb1c5fc (diff) |
Cycles: Split path initialization into own kernel
This makes it easier to initialize things correctly in the data_init kernel
before they are needed by path tracing.
Diffstat (limited to 'intern/cycles/kernel/kernels/cpu')
-rw-r--r-- | intern/cycles/kernel/kernels/cpu/kernel_cpu.h | 1 | ||||
-rw-r--r-- | intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernels/cpu/kernel_cpu.h b/intern/cycles/kernel/kernels/cpu/kernel_cpu.h index 1d710157817..8c1675665cb 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel_cpu.h +++ b/intern/cycles/kernel/kernels/cpu/kernel_cpu.h @@ -71,6 +71,7 @@ void KERNEL_FUNCTION_FULL_NAME(data_init)( #define DECLARE_SPLIT_KERNEL_FUNCTION(name) \ void KERNEL_FUNCTION_FULL_NAME(name)(KernelGlobals *kg, KernelData *data); +DECLARE_SPLIT_KERNEL_FUNCTION(path_init) DECLARE_SPLIT_KERNEL_FUNCTION(scene_intersect) DECLARE_SPLIT_KERNEL_FUNCTION(lamp_emission) DECLARE_SPLIT_KERNEL_FUNCTION(queue_enqueue) diff --git a/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h b/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h index c59f4892546..f6e0591ef24 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h +++ b/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h @@ -38,6 +38,7 @@ # include "split/kernel_split_common.h" # include "split/kernel_data_init.h" +# include "split/kernel_path_init.h" # include "split/kernel_scene_intersect.h" # include "split/kernel_lamp_emission.h" # include "split/kernel_queue_enqueue.h" @@ -163,6 +164,7 @@ void KERNEL_FUNCTION_FULL_NAME(shader)(KernelGlobals *kg, kernel_##name(kg); \ } +DEFINE_SPLIT_KERNEL_FUNCTION(path_init) DEFINE_SPLIT_KERNEL_FUNCTION(scene_intersect) DEFINE_SPLIT_KERNEL_FUNCTION(lamp_emission) DEFINE_SPLIT_KERNEL_FUNCTION(queue_enqueue) @@ -186,6 +188,7 @@ void KERNEL_FUNCTION_FULL_NAME(register_functions)(void(*reg)(const char* name, REGISTER(shader); REGISTER(data_init); + REGISTER(path_init); REGISTER(scene_intersect); REGISTER(lamp_emission); REGISTER(queue_enqueue); |