Blender Git Loki
Git Commits -> Revision 2c503d8
Revision 2c503d8 by Sergey Sharybin (master) May 22, 2015, 11:31 (GMT) |
Cycles: Restructure kernel files organization Since the kernel split work we're now having quite a few of new files, majority of which are related on the kernel entry points. Keeping those files in the root kernel folder will eventually make it really hard to follow which files are actual implementation of Cycles kernel. Those files are now moved to kernel/kernels/<device_type>. This way adding extra entry points will be less noisy. It is also nice to have all device-specific files grouped together. Another change is in the way how split kernel invokes logic. Previously all the logic was implemented directly in the .cl files, which makes it a bit tricky to re-use the logic across other devices. Since we'll likely be looking into doing same split work for CUDA devices eventually it makes sense to move logic from .cl files to header files. Those files are stored in kernel/split. This does not mean the header files will not give error messages when tried to be included from other devices and their arguments will likely be changed, but having such separation is a good start anyway. There should be no functional changes. Reviewers: juicyfruit, dingto Differential Revision: https://developer.blender.org/D1314 |
Commit Details:
Full Hash: 2c503d8303299c27b874e11e89a1229c00dfa55d
Parent Commit: 7f4d585
Lines Changed: +3832, -3055
31 Added Paths:
/intern/cycles/kernel/kernels/cpu/kernel.cpp (+132, -0) (View)
/intern/cycles/kernel/kernels/cpu/kernel_avx.cpp (+86, -0) (View)
/intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp (+87, -0) (View)
/intern/cycles/kernel/kernels/cpu/kernel_sse2.cpp (+83, -0) (View)
/intern/cycles/kernel/kernels/cpu/kernel_sse3.cpp (+84, -0) (View)
/intern/cycles/kernel/kernels/cpu/kernel_sse41.cpp (+85, -0) (View)
/intern/cycles/kernel/kernels/cuda/kernel.cu (+180, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel.cl (+174, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_background_buffer_update.cl (+81, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_data_init.cl (+242, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl (+47, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl (+67, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl (+52, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl (+59, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl (+29, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl (+53, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_shader_eval.cl (+43, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl (+47, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_sum_all_radiance.cl (+38, -0) (View)
/intern/cycles/kernel/split/kernel_background_buffer_update.h (+282, -0) (View)
/intern/cycles/kernel/split/kernel_data_init.h (+400, -0) (View)
/intern/cycles/kernel/split/kernel_direct_lighting.h (+138, -0) (View)
/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h (+283, -0) (View)
/intern/cycles/kernel/split/kernel_lamp_emission.h (+209, -0) (View)
/intern/cycles/kernel/split/kernel_next_iteration_setup.h (+176, -0) (View)
/intern/cycles/kernel/split/kernel_queue_enqueue.h (+98, -0) (View)
/intern/cycles/kernel/split/kernel_scene_intersect.h (+164, -0) (View)
/intern/cycles/kernel/split/kernel_shader_eval.h (+93, -0) (View)
/intern/cycles/kernel/split/kernel_shadow_blocked.h (+126, -0) (View)
/intern/cycles/kernel/split/kernel_split_common.h (+62, -0) (View)
/intern/cycles/kernel/split/kernel_sum_all_radiance.h (+59, -0) (View)
/intern/cycles/kernel/kernels/cpu/kernel_avx.cpp (+86, -0) (View)
/intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp (+87, -0) (View)
/intern/cycles/kernel/kernels/cpu/kernel_sse2.cpp (+83, -0) (View)
/intern/cycles/kernel/kernels/cpu/kernel_sse3.cpp (+84, -0) (View)
/intern/cycles/kernel/kernels/cpu/kernel_sse41.cpp (+85, -0) (View)
/intern/cycles/kernel/kernels/cuda/kernel.cu (+180, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel.cl (+174, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_background_buffer_update.cl (+81, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_data_init.cl (+242, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl (+47, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl (+67, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl (+52, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl (+59, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl (+29, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl (+53, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_shader_eval.cl (+43, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl (+47, -0) (View)
/intern/cycles/kernel/kernels/opencl/kernel_sum_all_radiance.cl (+38, -0) (View)
/intern/cycles/kernel/split/kernel_background_buffer_update.h (+282, -0) (View)
/intern/cycles/kernel/split/kernel_data_init.h (+400, -0) (View)
/intern/cycles/kernel/split/kernel_direct_lighting.h (+138, -0) (View)
/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h (+283, -0) (View)
/intern/cycles/kernel/split/kernel_lamp_emission.h (+209, -0) (View)
/intern/cycles/kernel/split/kernel_next_iteration_setup.h (+176, -0) (View)
/intern/cycles/kernel/split/kernel_queue_enqueue.h (+98, -0) (View)
/intern/cycles/kernel/split/kernel_scene_intersect.h (+164, -0) (View)
/intern/cycles/kernel/split/kernel_shader_eval.h (+93, -0) (View)
/intern/cycles/kernel/split/kernel_shadow_blocked.h (+126, -0) (View)
/intern/cycles/kernel/split/kernel_split_common.h (+62, -0) (View)
/intern/cycles/kernel/split/kernel_sum_all_radiance.h (+59, -0) (View)
20 Deleted Paths:
/intern/cycles/kernel/kernel.cl (+0, -174)
/intern/cycles/kernel/kernel.cpp (+0, -132)
/intern/cycles/kernel/kernel.cu (+0, -180)
/intern/cycles/kernel/kernel_avx.cpp (+0, -86)
/intern/cycles/kernel/kernel_avx2.cpp (+0, -87)
/intern/cycles/kernel/kernel_background_buffer_update.cl (+0, -282)
/intern/cycles/kernel/kernel_data_init.cl (+0, -400)
/intern/cycles/kernel/kernel_direct_lighting.cl (+0, -138)
/intern/cycles/kernel/kernel_Holdout_Emission_Blurring_Pathtermination_AO.cl (+0, -283)
/intern/cycles/kernel/kernel_lamp_emission.cl (+0, -209)
/intern/cycles/kernel/kernel_next_iteration_setup.cl (+0, -176)
/intern/cycles/kernel/kernel_queue_enqueue.cl (+0, -98)
/intern/cycles/kernel/kernel_scene_intersect.cl (+0, -164)
/intern/cycles/kernel/kernel_shader_eval.cl (+0, -93)
/intern/cycles/kernel/kernel_shadow_blocked.cl (+0, -126)
/intern/cycles/kernel/kernel_split.h (+0, -62)
/intern/cycles/kernel/kernel_sse2.cpp (+0, -83)
/intern/cycles/kernel/kernel_sse3.cpp (+0, -84)
/intern/cycles/kernel/kernel_sse41.cpp (+0, -85)
/intern/cycles/kernel/kernel_sum_all_radiance.cl (+0, -59)
/intern/cycles/kernel/kernel.cpp (+0, -132)
/intern/cycles/kernel/kernel.cu (+0, -180)
/intern/cycles/kernel/kernel_avx.cpp (+0, -86)
/intern/cycles/kernel/kernel_avx2.cpp (+0, -87)
/intern/cycles/kernel/kernel_background_buffer_update.cl (+0, -282)
/intern/cycles/kernel/kernel_data_init.cl (+0, -400)
/intern/cycles/kernel/kernel_direct_lighting.cl (+0, -138)
/intern/cycles/kernel/kernel_Holdout_Emission_Blurring_Pathtermination_AO.cl (+0, -283)
/intern/cycles/kernel/kernel_lamp_emission.cl (+0, -209)
/intern/cycles/kernel/kernel_next_iteration_setup.cl (+0, -176)
/intern/cycles/kernel/kernel_queue_enqueue.cl (+0, -98)
/intern/cycles/kernel/kernel_scene_intersect.cl (+0, -164)
/intern/cycles/kernel/kernel_shader_eval.cl (+0, -93)
/intern/cycles/kernel/kernel_shadow_blocked.cl (+0, -126)
/intern/cycles/kernel/kernel_split.h (+0, -62)
/intern/cycles/kernel/kernel_sse2.cpp (+0, -83)
/intern/cycles/kernel/kernel_sse3.cpp (+0, -84)
/intern/cycles/kernel/kernel_sse41.cpp (+0, -85)
/intern/cycles/kernel/kernel_sum_all_radiance.cl (+0, -59)