diff options
Diffstat (limited to 'intern')
17 files changed, 35 insertions, 35 deletions
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_buffer_update.cl b/intern/cycles/kernel/kernels/opencl/kernel_buffer_update.cl index d3058501f27..3c25d1d85a2 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_buffer_update.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_buffer_update.cl @@ -19,8 +19,8 @@ #include "split/kernel_buffer_update.h" __kernel void kernel_ocl_path_trace_buffer_update( - KernelGlobals *kg, + ccl_global char *kg, ccl_constant KernelData *data) { - kernel_buffer_update(kg); + kernel_buffer_update((KernelGlobals*)kg); } diff --git a/intern/cycles/kernel/kernels/opencl/kernel_data_init.cl b/intern/cycles/kernel/kernels/opencl/kernel_data_init.cl index 1e3c4fa28c7..54d4a577e10 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_data_init.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_data_init.cl @@ -19,7 +19,7 @@ #include "split/kernel_data_init.h" __kernel void kernel_ocl_path_trace_data_init( - KernelGlobals *kg, + ccl_global char *kg, ccl_constant KernelData *data, ccl_global void *split_data_buffer, int num_elements, @@ -40,7 +40,7 @@ __kernel void kernel_ocl_path_trace_data_init( unsigned int num_samples, /* Total number of samples per pixel */ ccl_global float *buffer) { - kernel_data_init(kg, + kernel_data_init((KernelGlobals*)kg, data, split_data_buffer, num_elements, diff --git a/intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl b/intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl index 5d2f46b319d..942a80f94f5 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl @@ -19,8 +19,8 @@ #include "split/kernel_direct_lighting.h" __kernel void kernel_ocl_path_trace_direct_lighting( - KernelGlobals *kg, + ccl_global char *kg, ccl_constant KernelData *data) { - kernel_direct_lighting(kg); + kernel_direct_lighting((KernelGlobals*)kg); } diff --git a/intern/cycles/kernel/kernels/opencl/kernel_do_volume.cl b/intern/cycles/kernel/kernels/opencl/kernel_do_volume.cl index 6380e9cb746..08187b0e03e 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_do_volume.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_do_volume.cl @@ -19,8 +19,8 @@ #include "split/kernel_do_volume.h" __kernel void kernel_ocl_path_trace_do_volume( - KernelGlobals *kg, + ccl_global char *kg, ccl_constant KernelData *data) { - kernel_do_volume(kg); + kernel_do_volume((KernelGlobals*)kg); } diff --git a/intern/cycles/kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl b/intern/cycles/kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl index 7724b8a0bdf..209080fecd6 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl @@ -19,8 +19,8 @@ #include "split/kernel_holdout_emission_blurring_pathtermination_ao.h" __kernel void kernel_ocl_path_trace_holdout_emission_blurring_pathtermination_ao( - KernelGlobals *kg, + ccl_global char *kg, ccl_constant KernelData *data) { - kernel_holdout_emission_blurring_pathtermination_ao(kg); + kernel_holdout_emission_blurring_pathtermination_ao((KernelGlobals*)kg); } diff --git a/intern/cycles/kernel/kernels/opencl/kernel_indirect_background.cl b/intern/cycles/kernel/kernels/opencl/kernel_indirect_background.cl index 671501bf237..b18fba4c01f 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_indirect_background.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_indirect_background.cl @@ -19,8 +19,8 @@ #include "split/kernel_indirect_background.h" __kernel void kernel_ocl_path_trace_indirect_background( - KernelGlobals *kg, + ccl_global char *kg, ccl_constant KernelData *data) { - kernel_indirect_background(kg); + kernel_indirect_background((KernelGlobals*)kg); } diff --git a/intern/cycles/kernel/kernels/opencl/kernel_indirect_subsurface.cl b/intern/cycles/kernel/kernels/opencl/kernel_indirect_subsurface.cl index b5e52e81ebf..ce2e96ad789 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_indirect_subsurface.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_indirect_subsurface.cl @@ -19,8 +19,8 @@ #include "split/kernel_indirect_subsurface.h" __kernel void kernel_ocl_path_trace_indirect_subsurface( - KernelGlobals *kg, + ccl_global char *kg, ccl_constant KernelData *data) { - kernel_indirect_subsurface(kg); + kernel_indirect_subsurface((KernelGlobals*)kg); } diff --git a/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl b/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl index 2b84d0ea43e..830e4e373ac 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl @@ -19,8 +19,8 @@ #include "split/kernel_lamp_emission.h" __kernel void kernel_ocl_path_trace_lamp_emission( - KernelGlobals *kg, + ccl_global char *kg, ccl_constant KernelData *data) { - kernel_lamp_emission(kg); + kernel_lamp_emission((KernelGlobals*)kg); } 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 e87e367fb9c..2a007e39c33 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl @@ -19,8 +19,8 @@ #include "split/kernel_next_iteration_setup.h" __kernel void kernel_ocl_path_trace_next_iteration_setup( - KernelGlobals *kg, + ccl_global char *kg, ccl_constant KernelData *data) { - kernel_next_iteration_setup(kg); + kernel_next_iteration_setup((KernelGlobals*)kg); } diff --git a/intern/cycles/kernel/kernels/opencl/kernel_path_init.cl b/intern/cycles/kernel/kernels/opencl/kernel_path_init.cl index 7e9e4a02529..8194f5d22ca 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_path_init.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_path_init.cl @@ -19,8 +19,8 @@ #include "split/kernel_path_init.h" __kernel void kernel_ocl_path_trace_path_init( - KernelGlobals *kg, + ccl_global char *kg, ccl_constant KernelData *data) { - kernel_path_init(kg); + kernel_path_init((KernelGlobals*)kg); } diff --git a/intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl b/intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl index 9ceb6a5c3d8..19074db1b81 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl @@ -19,8 +19,8 @@ #include "split/kernel_queue_enqueue.h" __kernel void kernel_ocl_path_trace_queue_enqueue( - KernelGlobals *kg, + ccl_global char *kg, ccl_constant KernelData *data) { - kernel_queue_enqueue(kg); + kernel_queue_enqueue((KernelGlobals*)kg); } diff --git a/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl b/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl index 4e083e87d1c..c675640c599 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl @@ -19,8 +19,8 @@ #include "split/kernel_scene_intersect.h" __kernel void kernel_ocl_path_trace_scene_intersect( - KernelGlobals *kg, + ccl_global char *kg, ccl_constant KernelData *data) { - kernel_scene_intersect(kg); + kernel_scene_intersect((KernelGlobals*)kg); } diff --git a/intern/cycles/kernel/kernels/opencl/kernel_shader_eval.cl b/intern/cycles/kernel/kernels/opencl/kernel_shader_eval.cl index a2b48b15928..534d37f695b 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_shader_eval.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_shader_eval.cl @@ -19,8 +19,8 @@ #include "split/kernel_shader_eval.h" __kernel void kernel_ocl_path_trace_shader_eval( - KernelGlobals *kg, + ccl_global char *kg, ccl_constant KernelData *data) { - kernel_shader_eval(kg); + kernel_shader_eval((KernelGlobals*)kg); } diff --git a/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked_ao.cl b/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked_ao.cl index 1c96d67fec2..37824097031 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked_ao.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked_ao.cl @@ -19,8 +19,8 @@ #include "split/kernel_shadow_blocked_ao.h" __kernel void kernel_ocl_path_trace_shadow_blocked_ao( - KernelGlobals *kg, + ccl_global char *kg, ccl_constant KernelData *data) { - kernel_shadow_blocked_ao(kg); + kernel_shadow_blocked_ao((KernelGlobals*)kg); } diff --git a/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked_dl.cl b/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked_dl.cl index 2231f767c0c..4889f49d8dc 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked_dl.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked_dl.cl @@ -19,8 +19,8 @@ #include "split/kernel_shadow_blocked_dl.h" __kernel void kernel_ocl_path_trace_shadow_blocked_dl( - KernelGlobals *kg, + ccl_global char *kg, ccl_constant KernelData *data) { - kernel_shadow_blocked_dl(kg); + kernel_shadow_blocked_dl((KernelGlobals*)kg); } diff --git a/intern/cycles/kernel/kernels/opencl/kernel_state_buffer_size.cl b/intern/cycles/kernel/kernels/opencl/kernel_state_buffer_size.cl index 4c9bf63ef51..b23ff33786d 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_state_buffer_size.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_state_buffer_size.cl @@ -18,12 +18,12 @@ #include "split/kernel_split_common.h" __kernel void kernel_ocl_path_trace_state_buffer_size( - KernelGlobals *kg, + ccl_global char *kg, ccl_constant KernelData *data, uint num_threads, ccl_global uint64_t *size) { - kg->data = data; - *size = split_data_buffer_size(kg, num_threads); + ((KernelGlobals*)kg)->data = data; + *size = split_data_buffer_size((KernelGlobals*)kg, num_threads); } diff --git a/intern/cycles/kernel/kernels/opencl/kernel_subsurface_scatter.cl b/intern/cycles/kernel/kernels/opencl/kernel_subsurface_scatter.cl index 8dae79bacb0..34a01bbdfe3 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_subsurface_scatter.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_subsurface_scatter.cl @@ -19,8 +19,8 @@ #include "split/kernel_subsurface_scatter.h" __kernel void kernel_ocl_path_trace_subsurface_scatter( - KernelGlobals *kg, + ccl_global char *kg, ccl_constant KernelData *data) { - kernel_subsurface_scatter(kg); + kernel_subsurface_scatter((KernelGlobals*)kg); } |