[Bf-blender-cvs] [4789c5ca6d] cycles_split_kernel: Cycles: Fix building of CUDA split kernel

[Mai Lavelle]

Commit: 4789c5ca6d0317a4d1745bec454319ead99f20b1
Author: Mai Lavelle
Date:   Tue Mar 7 05:22:44 2017 -0500
Branches: cycles_split_kernel
https://developer.blender.org/rB4789c5ca6d0317a4d1745bec454319ead99f20b1

Cycles: Fix building of CUDA split kernel

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

M	intern/cycles/kernel/kernels/cuda/kernel_split.cu

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

diff --git a/intern/cycles/kernel/kernels/cuda/kernel_split.cu b/intern/cycles/kernel/kernels/cuda/kernel_split.cu
index 3445573550..250d957673 100644
--- a/intern/cycles/kernel/kernels/cuda/kernel_split.cu
+++ b/intern/cycles/kernel/kernels/cuda/kernel_split.cu
@@ -25,6 +25,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"
@@ -34,12 +35,10 @@
 #include "../../split/kernel_direct_lighting.h"
 #include "../../split/kernel_shadow_blocked.h"
 #include "../../split/kernel_next_iteration_setup.h"
-#include "../../split/kernel_sum_all_radiance.h"
 
 #include "../../kernel_film.h"
 
 /* kernels */
-
 extern "C" __global__ void
 CUDA_LAUNCH_BOUNDS(CUDA_THREADS_BLOCK_WIDTH, CUDA_KERNEL_MAX_REGISTERS)
 kernel_cuda_state_buffer_size(uint num_threads, uint *size)
@@ -49,6 +48,13 @@ kernel_cuda_state_buffer_size(uint num_threads, uint *size)
 
 extern "C" __global__ void
 CUDA_LAUNCH_BOUNDS(CUDA_THREADS_BLOCK_WIDTH, CUDA_KERNEL_MAX_REGISTERS)
+kernel_cuda_path_init()
+{
+	kernel_path_init(NULL);
+}
+
+extern "C" __global__ void
+CUDA_LAUNCH_BOUNDS(CUDA_THREADS_BLOCK_WIDTH, CUDA_KERNEL_MAX_REGISTERS)
 kernel_cuda_path_trace_data_init(
         ccl_global void *split_data_buffer,
         int num_elements,
@@ -57,17 +63,11 @@ kernel_cuda_path_trace_data_init(
         int start_sample,
         int end_sample,
         int sx, int sy, int sw, int sh, int offset, int stride,
-        int rng_state_offset_x,
-        int rng_state_offset_y,
-        int rng_state_stride,
         ccl_global int *Queue_index,
         int queuesize,
         ccl_global char *use_queues_flag,
         ccl_global unsigned int *work_pool_wgs,
         unsigned int num_samples,
-        int buffer_offset_x,
-        int buffer_offset_y,
-        int buffer_stride,
         ccl_global float *buffer)
 {
 	kernel_data_init(NULL,
@@ -79,17 +79,11 @@ kernel_cuda_path_trace_data_init(
 	                 start_sample,
 	                 end_sample,
 	                 sx, sy, sw, sh, offset, stride,
-	                 rng_state_offset_x,
-	                 rng_state_offset_y,
-	                 rng_state_stride,
 	                 Queue_index,
 	                 queuesize,
 	                 use_queues_flag,
 	                 work_pool_wgs,
 	                 num_samples,
-	                 buffer_offset_x,
-	                 buffer_offset_y,
-	                 buffer_stride,
 	                 buffer);
 }