diff options
Diffstat (limited to 'intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl')
| -rw-r--r-- | intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl b/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl index 03886c0a030..edf76fba714 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl @@ -17,29 +17,16 @@ #include "split/kernel_shadow_blocked.h" __kernel void kernel_ocl_path_trace_shadow_blocked( - ccl_global char *globals, + ccl_global char *kg, ccl_constant KernelData *data, - ccl_global char *shader_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 */ - Intersection *Intersection_coop_AO, - Intersection *Intersection_coop_DL, 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. */ - if(get_global_id(0) == 0 && get_global_id(1) == 0) { - /* We empty this queue here */ - Queue_index[QUEUE_SHADOW_RAY_CAST_AO_RAYS] = 0; - Queue_index[QUEUE_SHADOW_RAY_CAST_DL_RAYS] = 0; - } -#endif - int lidx = get_local_id(1) * get_local_id(0) + get_local_id(0); ccl_local unsigned int ao_queue_length; @@ -68,16 +55,11 @@ __kernel void kernel_ocl_path_trace_shadow_blocked( if(ray_index == QUEUE_EMPTY_SLOT) return; - kernel_shadow_blocked(globals, - data, - shader_shadow, + kernel_shadow_blocked((KernelGlobals *)kg, PathState_coop, LightRay_dl_coop, LightRay_ao_coop, - Intersection_coop_AO, - Intersection_coop_DL, ray_state, - total_num_rays, shadow_blocked_type, ray_index); } |