diff options
7 files changed, 2 insertions, 17 deletions
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index 4eeec4003ff..e612b9f581f 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -2689,7 +2689,6 @@ public: } cl_int dQueue_size = global_size[0] * global_size[1]; - cl_int total_num_rays = global_size[0] * global_size[1]; cl_uint start_arg_index = kernel_set_args(ckPathTraceKernel_data_init, @@ -2957,15 +2956,13 @@ public: 0, kgbuffer, d_data, - sd_DL_shadow, PathState_coop, LightRay_coop, AOLightRay_coop, ray_state, Queue_data, Queue_index, - dQueue_size, - total_num_rays); + dQueue_size); kernel_set_args(ckPathTraceKernel_next_iteration_setup, 0, diff --git a/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl b/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl index 3ad9fe59617..267bddc2ffc 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl @@ -76,6 +76,5 @@ __kernel void kernel_ocl_path_trace_lamp_emission( ray_state, sw, sh, use_queues_flag, - parallel_samples, ray_index); } diff --git a/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl b/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl index 12eff6ccc1a..7f3f433c7a6 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl @@ -76,6 +76,5 @@ __kernel void kernel_ocl_path_trace_scene_intersect( #ifdef __KERNEL_DEBUG__ debugdata_coop, #endif - parallel_samples, ray_index); } diff --git a/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl b/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl index ba0a9a80c07..0a4a87281b2 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl @@ -19,15 +19,13 @@ __kernel void kernel_ocl_path_trace_shadow_blocked( ccl_global char *kg, ccl_constant KernelData *data, - ccl_global char *sd_shadow, /* Required for shadow blocked */ ccl_global PathState *PathState_coop, /* Required for shadow blocked */ ccl_global Ray *LightRay_dl_coop, /* Required for direct lighting's shadow blocked */ ccl_global Ray *LightRay_ao_coop, /* Required for AO's shadow blocked */ ccl_global char *ray_state, ccl_global int *Queue_data, /* Queue memory */ ccl_global int *Queue_index, /* Tracks the number of elements in each queue */ - int queuesize, /* Size (capacity) of each queue */ - int total_num_rays) + int queuesize) /* Size (capacity) of each queue */ { #if 0 /* We will make the Queue_index entries '0' in the next kernel. */ @@ -67,12 +65,10 @@ __kernel void kernel_ocl_path_trace_shadow_blocked( return; kernel_shadow_blocked((KernelGlobals *)kg, - (ShaderData *)sd_shadow, PathState_coop, LightRay_dl_coop, LightRay_ao_coop, ray_state, - total_num_rays, shadow_blocked_type, ray_index); } diff --git a/intern/cycles/kernel/split/kernel_lamp_emission.h b/intern/cycles/kernel/split/kernel_lamp_emission.h index b651f79d536..10372c5fc88 100644 --- a/intern/cycles/kernel/split/kernel_lamp_emission.h +++ b/intern/cycles/kernel/split/kernel_lamp_emission.h @@ -35,7 +35,6 @@ * use_queues_flag ------------------------------------| | * sw -------------------------------------------------| | * sh -------------------------------------------------| | - * parallel_samples -----------------------------------| | */ ccl_device void kernel_lamp_emission( KernelGlobals *kg, @@ -49,7 +48,6 @@ ccl_device void kernel_lamp_emission( ccl_global char *use_queues_flag, /* Used to decide if this kernel should use * queues to fetch ray index */ - int parallel_samples, /* Number of samples to be processed in parallel */ int ray_index) { if(IS_STATE(ray_state, ray_index, RAY_ACTIVE) || diff --git a/intern/cycles/kernel/split/kernel_scene_intersect.h b/intern/cycles/kernel/split/kernel_scene_intersect.h index 1a8b849fad0..faa752c360e 100644 --- a/intern/cycles/kernel/split/kernel_scene_intersect.h +++ b/intern/cycles/kernel/split/kernel_scene_intersect.h @@ -30,7 +30,6 @@ * PathState_coop ---------------------------------| |--- Intersection * ray_state --------------------------------------| |--- ray_state * use_queues_flag --------------------------------| | - * parallel_samples -------------------------------| | * QueueData(QUEUE_ACTIVE_AND_REGENERATED_RAYS) ---| | * kg (globals) -----------------------------------| | * rng_coop ---------------------------------------| | @@ -75,7 +74,6 @@ ccl_device void kernel_scene_intersect( #ifdef __KERNEL_DEBUG__ DebugData *debugdata_coop, #endif - int parallel_samples, /* Number of samples to be processed in parallel */ int ray_index) { /* All regenerated rays become active here */ diff --git a/intern/cycles/kernel/split/kernel_shadow_blocked.h b/intern/cycles/kernel/split/kernel_shadow_blocked.h index fce554179e3..0c989861eef 100644 --- a/intern/cycles/kernel/split/kernel_shadow_blocked.h +++ b/intern/cycles/kernel/split/kernel_shadow_blocked.h @@ -47,12 +47,10 @@ */ ccl_device void kernel_shadow_blocked( KernelGlobals *kg, - ShaderData *sd_shadow, /* Required for shadow blocked */ ccl_global PathState *PathState_coop, /* Required for shadow blocked */ ccl_global Ray *LightRay_dl_coop, /* Required for direct lighting's shadow blocked */ ccl_global Ray *LightRay_ao_coop, /* Required for AO's shadow blocked */ ccl_global char *ray_state, - int total_num_rays, char shadow_blocked_type, int ray_index) { |