[Bf-blender-cvs] [f36289ac1d] cycles_split_kernel: Cycles: Add changes that somehow got left out of previous commit

[Mai Lavelle]

Commit: f36289ac1d50fd94e425370edbd8b390e2e47e7e
Author: Mai Lavelle
Date:   Sat Feb 18 05:53:34 2017 -0500
Branches: cycles_split_kernel
https://developer.blender.org/rBf36289ac1d50fd94e425370edbd8b390e2e47e7e

Cycles: Add changes that somehow got left out of previous commit

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

M	intern/cycles/device/device_cpu.cpp
M	intern/cycles/device/device_cuda.cpp
M	intern/cycles/kernel/kernels/cpu/kernel_cpu.h

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

diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index 722274d042..b4d470747c 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -760,17 +760,11 @@ bool CPUSplitKernel::enqueue_split_kernel_data_init(const KernelDimensions& dim,
                                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);
 
 	data_init_t data_init;
@@ -830,17 +824,11 @@ bool CPUSplitKernel::enqueue_split_kernel_data_init(const KernelDimensions& dim,
 					  rtile.h,
 					  rtile.offset,
 					  rtile.stride,
-					  rtile.rng_state_offset_x,
-					  rtile.rng_state_offset_y,
-					  rtile.buffer_rng_state_stride,
 					  (int*)queue_index.device_pointer,
 					  dim.global_size[0] * dim.global_size[1],
 					  (char*)use_queues_flags.device_pointer,
 					  (uint*)work_pool_wgs.device_pointer,
 					  rtile.num_samples,
-					  rtile.buffer_offset_x,
-					  rtile.buffer_offset_y,
-					  rtile.buffer_rng_state_stride,
 					  (float*)rtile.buffer);
 		}
 	}
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 9d41ef3179..52f1b2a2a1 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -1508,17 +1508,11 @@ bool CUDASplitKernel::enqueue_split_kernel_data_init(const KernelDimensions& dim
 		int* sh;
 		int* offset;
 		int* stride;
-		int* rng_state_offset_x;
-		int* rng_state_offset_y;
-		int* rng_state_stride;
 		CUdeviceptr* queue_index;
 		int* queuesize;
 		CUdeviceptr* use_queues_flag;
 		CUdeviceptr* work_pool_wgs;
 		int* num_samples;
-		int* buffer_offset_x;
-		int* buffer_offset_y;
-		int* buffer_stride;
 		CUdeviceptr* buffer;
 	};
 
@@ -1535,17 +1529,11 @@ bool CUDASplitKernel::enqueue_split_kernel_data_init(const KernelDimensions& dim
 		&rtile.h,
 		&rtile.offset,
 		&rtile.stride,
-		&rtile.rng_state_offset_x,
-		&rtile.rng_state_offset_y,
-		&rtile.buffer_rng_state_stride,
 		&d_queue_index,
 		&queue_size,
 		&d_use_queues_flag,
 		&d_work_pool_wgs,
 		&rtile.num_samples,
-		&rtile.buffer_offset_x,
-		&rtile.buffer_offset_y,
-		&rtile.buffer_rng_state_stride,
 		&d_buffer
 	};
 
diff --git a/intern/cycles/kernel/kernels/cpu/kernel_cpu.h b/intern/cycles/kernel/kernels/cpu/kernel_cpu.h
index 7244c18531..1d71015781 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel_cpu.h
+++ b/intern/cycles/kernel/kernels/cpu/kernel_cpu.h
@@ -61,17 +61,11 @@ void KERNEL_FUNCTION_FULL_NAME(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);
 
 #define DECLARE_SPLIT_KERNEL_FUNCTION(name) \