diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-10-29 19:44:36 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-10-29 19:52:56 +0300 |
| commit | 4ca688a963408fe326ba8e2a696d7b0fdc4eb1e4 (patch) | |
| tree | eeffd8dbbb5bf80dd98220cc3d501749c030c6e6 /intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl | |
| parent | fc5f717888f11caaa9cd246e2131a3892c81fbd1 (diff) | |
Cycles: OpenCL split kernel cleanup, move casts from .h files to .cl files
Ideally we shouldn't use char* at all, but for now we have to, so at least
let's assume common .h files are free from pointer magic.
Diffstat (limited to 'intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl')
| -rw-r--r-- | intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl b/intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl index dcf4db40411..8896fe739d1 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl @@ -17,9 +17,9 @@ #include "split/kernel_next_iteration_setup.h" __kernel void kernel_ocl_path_trace_next_iteration_setup( - ccl_global char *globals, + ccl_global char *kg, ccl_constant KernelData *data, - ccl_global char *shader_data, /* Required for setting up ray for next iteration */ + ccl_global char *sd, /* Required for setting up ray for next iteration */ ccl_global uint *rng_coop, /* Required for setting up ray for next iteration */ ccl_global float3 *throughput_coop, /* Required for setting up ray for next iteration */ PathRadiance *PathRadiance_coop, /* Required for setting up ray for next iteration */ @@ -83,9 +83,9 @@ __kernel void kernel_ocl_path_trace_next_iteration_setup( #ifndef __COMPUTE_DEVICE_GPU__ if(ray_index != QUEUE_EMPTY_SLOT) { #endif - enqueue_flag = kernel_next_iteration_setup(globals, + enqueue_flag = kernel_next_iteration_setup((KernelGlobals *)kg, data, - shader_data, + (ShaderData *)sd, rng_coop, throughput_coop, PathRadiance_coop, |