Blender Git Loki
Git Commits -> Revision 84ad20a
Revision 84ad20a by Sergey Sharybin (master) May 26, 2015, 17:54 (GMT) |
Fix T44833: Can't use ccl_local space in non-kernel functions This commit re-shuffles code in split kernel once again and makes it so common parts which is in the headers is only responsible to making all the work needed for specified ray index. Getting ray index, checking for it's validity and enqueuing tasks are now happening in the device specified part of the kernel. This actually makes sense because enqueuing is indeed device-specified and i.e. with CUDA we'll want to enqueue kernels from kernel and avoid CPU roundtrip. TODO: - Kernel comments are still placed in the common header files, but since queue related stuff is not passed to those functions those comments might need to be split as well. Just currently read them considering that they're also covering the way how all devices are invoking the common code path. - Arguments might need to be wrapped into KernelGlobals, so we don't ened to pass all them around as function arguments. |
Commit Details:
Full Hash: 84ad20acef4c0db91c9a850e81c7dc0a57aef42a
Parent Commit: 4ffcc6f
Lines Changed: +1140, -1105
1 Deleted Path:
/intern/cycles/kernel/split/kernel_queue_enqueue.h (+0, -98)
21 Modified Paths:
/intern/cycles/kernel/CMakeLists.txt (+0, -1) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_background_buffer_update.cl (+73, -26) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_data_init.cl (+87, -88) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl (+56, -13) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl (+78, -21) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl (+52, -20) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl (+76, -20) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl (+82, -5) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl (+34, -5) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_shader_eval.cl (+29, -3) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl (+40, -4) (Diff)
/intern/cycles/kernel/split/kernel_background_buffer_update.h (+124, -160) (Diff)
/intern/cycles/kernel/split/kernel_data_init.h (+89, -91) (Diff)
/intern/cycles/kernel/split/kernel_direct_lighting.h (+42, -75) (Diff)
/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h (+129, -168) (Diff)
/intern/cycles/kernel/split/kernel_lamp_emission.h (+17, -50) (Diff)
/intern/cycles/kernel/split/kernel_next_iteration_setup.h (+58, -102) (Diff)
/intern/cycles/kernel/split/kernel_scene_intersect.h (+15, -44) (Diff)
/intern/cycles/kernel/split/kernel_shader_eval.h (+11, -34) (Diff)
/intern/cycles/kernel/split/kernel_shadow_blocked.h (+35, -62) (Diff)
/intern/cycles/kernel/split/kernel_sum_all_radiance.h (+13, -15) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_background_buffer_update.cl (+73, -26) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_data_init.cl (+87, -88) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl (+56, -13) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl (+78, -21) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl (+52, -20) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl (+76, -20) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl (+82, -5) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl (+34, -5) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_shader_eval.cl (+29, -3) (Diff)
/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl (+40, -4) (Diff)
/intern/cycles/kernel/split/kernel_background_buffer_update.h (+124, -160) (Diff)
/intern/cycles/kernel/split/kernel_data_init.h (+89, -91) (Diff)
/intern/cycles/kernel/split/kernel_direct_lighting.h (+42, -75) (Diff)
/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h (+129, -168) (Diff)
/intern/cycles/kernel/split/kernel_lamp_emission.h (+17, -50) (Diff)
/intern/cycles/kernel/split/kernel_next_iteration_setup.h (+58, -102) (Diff)
/intern/cycles/kernel/split/kernel_scene_intersect.h (+15, -44) (Diff)
/intern/cycles/kernel/split/kernel_shader_eval.h (+11, -34) (Diff)
/intern/cycles/kernel/split/kernel_shadow_blocked.h (+35, -62) (Diff)
/intern/cycles/kernel/split/kernel_sum_all_radiance.h (+13, -15) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021