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_scene_intersect.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_scene_intersect.cl')
| -rw-r--r-- | intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl b/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl index e5fad7bce50..3750a0d0062 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl @@ -17,7 +17,7 @@ #include "split/kernel_scene_intersect.h" __kernel void kernel_ocl_path_trace_scene_intersect( - ccl_global char *globals, + ccl_global char *kg, ccl_constant KernelData *data, ccl_global uint *rng_coop, ccl_global Ray *Ray_coop, /* Required for scene_intersect */ @@ -65,7 +65,7 @@ __kernel void kernel_ocl_path_trace_scene_intersect( } } - kernel_scene_intersect(globals, + kernel_scene_intersect((KernelGlobals *)kg, data, rng_coop, Ray_coop, |