Blender Git Commit Log

Git Commits -> Revision 8f7caeb

Revision 8f7caeb by Brecht Van Lommel (cycles-x)
March 19, 2021, 12:29 (GMT)
Cleanup: rename and move various files for consistency

* Shorten filenames when they are in a device specific folder
* Rename kernel/kernels to kernel/device
* Move kernel_*_compat.h to kernel/device/*/compat.h
* Move kernel_globals.h to kernel/device/*/globals.h
* Move kernel.h and filter.h into kernel/device/cpu
* Rename path trace work classes from Pixel/Tiled to CPU/GPU
* Remove old OpenCL split kernel files

Commit Details:

Full Hash: 8f7caeb3137b5d820564b2e136b681ef12d16157
Parent Commit: 64274b0
Lines Changed: +18540, -19164

69 Added Paths:

/intern/cycles/device/cpu/device.cpp (+61, -0) (View)
/intern/cycles/device/cpu/device.h (+35, -0) (View)
/intern/cycles/device/cpu/device_impl.cpp (+1213, -0) (View)
/intern/cycles/device/cpu/device_impl.h (+184, -0) (View)
/intern/cycles/device/cpu/queue.cpp (+99, -0) (View)
/intern/cycles/device/cpu/queue.h (+62, -0) (View)
/intern/cycles/device/cuda/device.cpp (+340, -0) (View)
/intern/cycles/device/cuda/device.h (+37, -0) (View)
/intern/cycles/device/cuda/device_impl.cpp (+2378, -0) (View)
/intern/cycles/device/cuda/device_impl.h (+275, -0) (View)
/intern/cycles/device/dummy/device.cpp (+90, -0) (View)
/intern/cycles/device/dummy/device.h (+31, -0) (View)
/intern/cycles/device/multi/device.cpp (+796, -0) (View)
/intern/cycles/device/multi/device.h (+31, -0) (View)
/intern/cycles/device/opencl/device.cpp (+265, -0) (View)
/intern/cycles/device/opencl/device.h (+37, -0) (View)
/intern/cycles/device/opencl/device_impl.cpp (+2176, -0) (View)
/intern/cycles/device/opencl/device_impl.h (+663, -0) (View)
/intern/cycles/device/opencl/util.cpp (+1325, -0) (View)
/intern/cycles/device/optix/device.cpp (+1897, -0) (View)
/intern/cycles/device/optix/device.h (+35, -0) (View)
/intern/cycles/integrator/path_trace_work_cpu.cpp (+114, -0) (View)
/intern/cycles/integrator/path_trace_work_cpu.h (+70, -0) (View)
/intern/cycles/integrator/path_trace_work_gpu.cpp (+387, -0) (View)
/intern/cycles/integrator/path_trace_work_gpu.h (+90, -0) (View)
/intern/cycles/kernel/device/cpu/compat.h (+153, -0) (View)
/intern/cycles/kernel/device/cpu/filter.cpp (+61, -0) (View)
/intern/cycles/kernel/device/cpu/filter.h (+51, -0) (View)
/intern/cycles/kernel/device/cpu/filter_arch.h (+143, -0) (View)
/intern/cycles/kernel/device/cpu/filter_arch_impl.h (+333, -0) (View)
/intern/cycles/kernel/device/cpu/filter_avx.cpp (+39, -0) (View)
/intern/cycles/kernel/device/cpu/filter_avx2.cpp (+40, -0) (View)
/intern/cycles/kernel/device/cpu/filter_sse2.cpp (+34, -0) (View)
/intern/cycles/kernel/device/cpu/filter_sse3.cpp (+36, -0) (View)
/intern/cycles/kernel/device/cpu/filter_sse41.cpp (+38, -0) (View)
/intern/cycles/kernel/device/cpu/globals.h (+80, -0) (View)
/intern/cycles/kernel/device/cpu/image.h (+657, -0) (View)
/intern/cycles/kernel/device/cpu/kernel.cpp (+94, -0) (View)
/intern/cycles/kernel/device/cpu/kernel.h (+64, -0) (View)
/intern/cycles/kernel/device/cpu/kernel_arch.h (+82, -0) (View)
/intern/cycles/kernel/device/cpu/kernel_arch_impl.h (+209, -0) (View)
/intern/cycles/kernel/device/cpu/kernel_avx.cpp (+39, -0) (View)
/intern/cycles/kernel/device/cpu/kernel_avx2.cpp (+40, -0) (View)
/intern/cycles/kernel/device/cpu/kernel_sse2.cpp (+34, -0) (View)
/intern/cycles/kernel/device/cpu/kernel_sse3.cpp (+36, -0) (View)
/intern/cycles/kernel/device/cpu/kernel_sse41.cpp (+37, -0) (View)
/intern/cycles/kernel/device/cuda/compat.h (+175, -0) (View)
/intern/cycles/kernel/device/cuda/config.h (+119, -0) (View)
/intern/cycles/kernel/device/cuda/filter.cu (+454, -0) (View)
/intern/cycles/kernel/device/cuda/globals.h (+40, -0) (View)
/intern/cycles/kernel/device/cuda/image.h (+271, -0) (View)
/intern/cycles/kernel/device/cuda/kernel.cu (+441, -0) (View)
/intern/cycles/kernel/device/cuda/parallel_active_index.h (+84, -0) (View)
/intern/cycles/kernel/device/cuda/parallel_reduce.h (+83, -0) (View)
/intern/cycles/kernel/device/opencl/compat.h (+174, -0) (View)
/intern/cycles/kernel/device/opencl/filter.cl (+321, -0) (View)
/intern/cycles/kernel/device/opencl/globals.h (+89, -0) (View)
/intern/cycles/kernel/device/opencl/image.h (+358, -0) (View)
/intern/cycles/kernel/device/opencl/kernel_adaptive_adjust_samples.cl (+23, -0) (View)
/intern/cycles/kernel/device/opencl/kernel_adaptive_filter_x.cl (+23, -0) (View)
/intern/cycles/kernel/device/opencl/kernel_adaptive_filter_y.cl (+23, -0) (View)
/intern/cycles/kernel/device/opencl/kernel_adaptive_stopping.cl (+23, -0) (View)
/intern/cycles/kernel/device/opencl/kernel_bake.cl (+33, -0) (View)
/intern/cycles/kernel/device/opencl/kernel_base.cl (+87, -0) (View)
/intern/cycles/kernel/device/opencl/kernel_displace.cl (+33, -0) (View)
/intern/cycles/kernel/device/optix/compat.h (+94, -0) (View)
/intern/cycles/kernel/device/optix/globals.h (+53, -0) (View)
/intern/cycles/kernel/device/optix/kernel.cu (+325, -0) (View)
/intern/cycles/kernel/kernel_lookup_table.h (+56, -0) (View)

88 Deleted Paths:

/intern/cycles/device/cpu/device_cpu.cpp (+0, -62)
/intern/cycles/device/cpu/device_cpu.h (+0, -35)
/intern/cycles/device/cpu/device_cpu_impl.cpp (+0, -1213)
/intern/cycles/device/cpu/device_cpu_impl.h (+0, -185)
/intern/cycles/device/cpu/device_queue.cpp (+0, -98)
/intern/cycles/device/cpu/device_queue.h (+0, -64)
/intern/cycles/device/cuda/device_cuda.cpp (+0, -340)
/intern/cycles/device/cuda/device_cuda.h (+0, -37)
/intern/cycles/device/cuda/device_cuda_impl.cpp (+0, -2378)
/intern/cycles/device/cuda/device_cuda_impl.h (+0, -275)
/intern/cycles/device/dummy/device_dummy.cpp (+0, -90)
/intern/cycles/device/dummy/device_dummy.h (+0, -31)
/intern/cycles/device/multi/device_multi.cpp (+0, -796)
/intern/cycles/device/multi/device_multi.h (+0, -31)
/intern/cycles/device/opencl/device_opencl.cpp (+0, -265)
/intern/cycles/device/opencl/device_opencl.h (+0, -37)
/intern/cycles/device/opencl/device_opencl_impl.cpp (+0, -2178)
/intern/cycles/device/opencl/device_opencl_impl.h (+0, -663)
/intern/cycles/device/opencl/opencl_util.cpp (+0, -1325)
/intern/cycles/device/optix/device_optix.cpp (+0, -1897)
/intern/cycles/device/optix/device_optix.h (+0, -35)
/intern/cycles/integrator/path_trace_work_pixel.cpp (+0, -114)
/intern/cycles/integrator/path_trace_work_pixel.h (+0, -70)
/intern/cycles/integrator/path_trace_work_tiled.cpp (+0, -387)
/intern/cycles/integrator/path_trace_work_tiled.h (+0, -90)
/intern/cycles/kernel/filter/filter.h (+0, -49)
/intern/cycles/kernel/kernel.h (+0, -64)
/intern/cycles/kernel/kernels/cpu/filter.cpp (+0, -61)
/intern/cycles/kernel/kernels/cpu/filter_avx.cpp (+0, -39)
/intern/cycles/kernel/kernels/cpu/filter_avx2.cpp (+0, -40)
/intern/cycles/kernel/kernels/cpu/filter_cpu.h (+0, -143)
/intern/cycles/kernel/kernels/cpu/filter_cpu_impl.h (+0, -333)
/intern/cycles/kernel/kernels/cpu/filter_sse2.cpp (+0, -34)
/intern/cycles/kernel/kernels/cpu/filter_sse3.cpp (+0, -36)
/intern/cycles/kernel/kernels/cpu/filter_sse41.cpp (+0, -38)
/intern/cycles/kernel/kernels/cpu/kernel.cpp (+0, -94)
/intern/cycles/kernel/kernels/cpu/kernel_avx.cpp (+0, -39)
/intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp (+0, -40)
/intern/cycles/kernel/kernels/cpu/kernel_cpu.h (+0, -82)
/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h (+0, -657)
/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h (+0, -212)
/intern/cycles/kernel/kernels/cpu/kernel_sse2.cpp (+0, -34)
/intern/cycles/kernel/kernels/cpu/kernel_sse3.cpp (+0, -36)
/intern/cycles/kernel/kernels/cpu/kernel_sse41.cpp (+0, -37)
/intern/cycles/kernel/kernels/cuda/filter.cu (+0, -455)
/intern/cycles/kernel/kernels/cuda/kernel.cu (+0, -447)
/intern/cycles/kernel/kernels/cuda/kernel_config.h (+0, -119)
/intern/cycles/kernel/kernels/cuda/kernel_cuda_image.h (+0, -265)
/intern/cycles/kernel/kernels/cuda/parallel_active_index.h (+0, -78)
/intern/cycles/kernel/kernels/cuda/parallel_reduce.h (+0, -77)
/intern/cycles/kernel/kernels/opencl/filter.cl (+0, -321)
/intern/cycles/kernel/kernels/opencl/kernel_adaptive_adjust_samples.cl (+0, -23)
/intern/cycles/kernel/kernels/opencl/kernel_adaptive_filter_x.cl (+0, -23)
/intern/cycles/kernel/kernels/opencl/kernel_adaptive_filter_y.cl (+0, -23)
/intern/cycles/kernel/kernels/opencl/kernel_adaptive_stopping.cl (+0, -23)
/intern/cycles/kernel/kernels/opencl/kernel_background.cl (+0, -35)
/intern/cycles/kernel/kernels/opencl/kernel_bake.cl (+0, -36)
/intern/cycles/kernel/kernels/opencl/kernel_base.cl (+0, -88)
/intern/cycles/kernel/kernels/opencl/kernel_buffer_update.cl (+0, -26)
/intern/cycles/kernel/kernels/opencl/kernel_data_init.cl (+0, -53)
/intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl (+0, -26)
/intern/cycles/kernel/kernels/opencl/kernel_displace.cl (+0, -36)
/intern/cycles/kernel/kernels/opencl/kernel_do_volume.cl (+0, -24)
/intern/cycles/kernel/kernels/opencl/kernel_enqueue_inactive.cl (+0, -26)
/intern/cycles/kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl (+0, -26)
/intern/cycles/kernel/kernels/opencl/kernel_indirect_background.cl (+0, -24)
/intern/cycles/kernel/kernels/opencl/kernel_indirect_subsurface.cl (+0, -24)
/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl (+0, -24)
/intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl (+0, -26)
/intern/cycles/kernel/kernels/opencl/kernel_opencl_image.h (+0, -358)
/intern/cycles/kernel/kernels/opencl/kernel_path_init.cl (+0, -24)
/intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl (+0, -26)
/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl (+0, -24)
/intern/cycles/kernel/kernels/opencl/kernel_shader_eval.cl (+0, -24)
/intern/cycles/kernel/kernels/opencl/kernel_shader_setup.cl (+0, -26)
/intern/cycles/kernel/kernels/opencl/kernel_shader_sort.cl (+0, -27)
/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked_ao.cl (+0, -24)
/intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked_dl.cl (+0, -24)
/intern/cycles/kernel/kernels/opencl/kernel_split_bundle.cl (+0, -34)
/intern/cycles/kernel/kernels/opencl/kernel_split_function.h (+0, -67)
/intern/cycles/kernel/kernels/opencl/kernel_state_buffer_size.cl (+0, -29)
/intern/cycles/kernel/kernels/opencl/kernel_subsurface_scatter.cl (+0, -24)
/intern/cycles/kernel/kernels/optix/kernel_optix.cu (+0, -327)
/intern/cycles/kernel/kernel_compat_cpu.h (+0, -153)
/intern/cycles/kernel/kernel_compat_cuda.h (+0, -175)
/intern/cycles/kernel/kernel_compat_opencl.h (+0, -174)
/intern/cycles/kernel/kernel_compat_optix.h (+0, -94)
/intern/cycles/kernel/kernel_globals.h (+0, -242)

25 Modified Paths:

/intern/cycles/bvh/bvh_embree.cpp (+2, -2) (Diff)
/intern/cycles/device/CMakeLists.txt (+21, -21) (Diff)
/intern/cycles/device/cpu/kernel.cpp (+2, -4) (Diff)
/intern/cycles/device/cpu/kernel_thread_globals.h (+2, -5) (Diff)
/intern/cycles/device/cuda/kernel.cpp (+2, -3) (Diff)
/intern/cycles/device/cuda/queue.cpp (+2, -3) (Diff)
/intern/cycles/device/cuda/util.cpp (+2, -3) (Diff)
/intern/cycles/device/device.cpp (+7, -6) (Diff)
/intern/cycles/integrator/CMakeLists.txt (+4, -4) (Diff)
/intern/cycles/integrator/denoiser_oidn.cpp (+2, -5) (Diff)
/intern/cycles/integrator/path_trace_work.cpp (+6, -6) (Diff)
/intern/cycles/kernel/bvh/bvh_embree.h (+2, -4) (Diff)
/intern/cycles/kernel/closure/bsdf_microfacet.h (+1, -0) (Diff)
/intern/cycles/kernel/CMakeLists.txt (+91, -113) (Diff)
/intern/cycles/kernel/kernel_camera.h (+1, -0) (Diff)
/intern/cycles/kernel/osl/background.cpp (+1, -1) (Diff)
/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp (+1, -1) (Diff)
/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp (+1, -1) (Diff)
/intern/cycles/kernel/osl/emissive.cpp (+1, -1) (Diff)
/intern/cycles/kernel/osl/osl_bssrdf.cpp (+1, -1) (Diff)
/intern/cycles/kernel/osl/osl_closures.cpp (+3, -2) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+4, -3) (Diff)
/intern/cycles/kernel/osl/osl_shader.cpp (+3, -2) (Diff)
/intern/cycles/render/camera.cpp (+3, -2) (Diff)
/intern/cycles/render/coverage.cpp (+2, -3) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021