Blender Git Loki
Git Commits -> Revision 1df3b51
Revision 1df3b51 by Brecht Van Lommel (master) October 18, 2021, 17:02 (GMT) |
Cycles: replace integrator state argument macros * Rename struct KernelGlobals to struct KernelGlobalsCPU * Add KernelGlobals, IntegratorState and ConstIntegratorState typedefs that every device can define in its own way. * Remove INTEGRATOR_STATE_ARGS and INTEGRATOR_STATE_PASS macros and replace with these new typedefs. * Add explicit state argument to INTEGRATOR_STATE and similar macros In preparation for decoupling main and shadow paths. Differential Revision: https://developer.blender.org/D12888 |
Commit Details:
Full Hash: 1df3b51988852fa8ee6b530a64aa23346db9acd4
Parent Commit: 44c3bb7
Lines Changed: +1467, -1441
128 Modified Paths:
/intern/cycles/bvh/bvh_embree.cpp (+1, -1) (Diff)
/intern/cycles/device/cpu/device_impl.h (+1, -1) (Diff)
/intern/cycles/device/cpu/kernel.h (+10, -10) (Diff)
/intern/cycles/device/cpu/kernel_thread_globals.cpp (+4, -4) (Diff)
/intern/cycles/device/cpu/kernel_thread_globals.h (+4, -4) (Diff)
/intern/cycles/integrator/path_trace_work_cpu.cpp (+2, -2) (Diff)
/intern/cycles/integrator/path_trace_work_cpu.h (+2, -2) (Diff)
/intern/cycles/integrator/shader_eval.cpp (+1, -1) (Diff)
/intern/cycles/kernel/bvh/bvh.h (+5, -5) (Diff)
/intern/cycles/kernel/bvh/bvh_embree.h (+4, -4) (Diff)
/intern/cycles/kernel/bvh/bvh_local.h (+2, -2) (Diff)
/intern/cycles/kernel/bvh/bvh_nodes.h (+5, -5) (Diff)
/intern/cycles/kernel/bvh/bvh_shadow_all.h (+2, -2) (Diff)
/intern/cycles/kernel/bvh/bvh_traversal.h (+2, -2) (Diff)
/intern/cycles/kernel/bvh/bvh_util.h (+10, -10) (Diff)
/intern/cycles/kernel/bvh/bvh_volume.h (+2, -2) (Diff)
/intern/cycles/kernel/bvh/bvh_volume_all.h (+2, -2) (Diff)
/intern/cycles/kernel/closure/bsdf.h (+3, -5) (Diff)
/intern/cycles/kernel/closure/bsdf_hair_principled.h (+4, -4) (Diff)
/intern/cycles/kernel/closure/bsdf_microfacet.h (+4, -4) (Diff)
/intern/cycles/kernel/closure/bsdf_microfacet_multi.h (+2, -2) (Diff)
/intern/cycles/kernel/device/cpu/globals.h (+4, -2) (Diff)
/intern/cycles/kernel/device/cpu/image.h (+2, -2) (Diff)
/intern/cycles/kernel/device/cpu/kernel.cpp (+2, -2) (Diff)
/intern/cycles/kernel/device/cpu/kernel.h (+7, -7) (Diff)
/intern/cycles/kernel/device/cpu/kernel_arch.h (+10, -10) (Diff)
/intern/cycles/kernel/device/cpu/kernel_arch_impl.h (+10, -10) (Diff)
/intern/cycles/kernel/device/cuda/globals.h (+2, -1) (Diff)
/intern/cycles/kernel/device/gpu/image.h (+2, -2) (Diff)
/intern/cycles/kernel/device/gpu/kernel.h (+12, -12) (Diff)
/intern/cycles/kernel/device/optix/globals.h (+2, -1) (Diff)
/intern/cycles/kernel/geom/geom_attribute.h (+5, -7) (Diff)
/intern/cycles/kernel/geom/geom_curve.h (+7, -10) (Diff)
/intern/cycles/kernel/geom/geom_curve_intersect.h (+2, -2) (Diff)
/intern/cycles/kernel/geom/geom_motion_curve.h (+5, -10) (Diff)
/intern/cycles/kernel/geom/geom_motion_triangle.h (+5, -10) (Diff)
/intern/cycles/kernel/geom/geom_motion_triangle_intersect.h (+4, -4) (Diff)
/intern/cycles/kernel/geom/geom_motion_triangle_shader.h (+1, -1) (Diff)
/intern/cycles/kernel/geom/geom_object.h (+42, -47) (Diff)
/intern/cycles/kernel/geom/geom_patch.h (+9, -9) (Diff)
/intern/cycles/kernel/geom/geom_primitive.h (+15, -17) (Diff)
/intern/cycles/kernel/geom/geom_shader_data.h (+6, -7) (Diff)
/intern/cycles/kernel/geom/geom_subd_triangle.h (+10, -14) (Diff)
/intern/cycles/kernel/geom/geom_triangle.h (+12, -17) (Diff)
/intern/cycles/kernel/geom/geom_triangle_intersect.h (+4, -4) (Diff)
/intern/cycles/kernel/geom/geom_volume.h (+2, -2) (Diff)
/intern/cycles/kernel/integrator/integrator_init_from_bake.h (+10, -9) (Diff)
/intern/cycles/kernel/integrator/integrator_init_from_camera.h (+8, -7) (Diff)
/intern/cycles/kernel/integrator/integrator_intersect_closest.h (+30, -28) (Diff)
/intern/cycles/kernel/integrator/integrator_intersect_shadow.h (+22, -20) (Diff)
/intern/cycles/kernel/integrator/integrator_intersect_subsurface.h (+2, -2) (Diff)
/intern/cycles/kernel/integrator/integrator_intersect_volume_stack.h (+13, -12) (Diff)
/intern/cycles/kernel/integrator/integrator_megakernel.h (+16, -15) (Diff)
/intern/cycles/kernel/integrator/integrator_shade_background.h (+38, -36) (Diff)
/intern/cycles/kernel/integrator/integrator_shade_light.h (+20, -18) (Diff)
/intern/cycles/kernel/integrator/integrator_shade_shadow.h (+39, -33) (Diff)
/intern/cycles/kernel/integrator/integrator_shade_surface.h (+102, -94) (Diff)
/intern/cycles/kernel/integrator/integrator_shade_volume.h (+82, -76) (Diff)
/intern/cycles/kernel/integrator/integrator_state.h (+24, -45) (Diff)
/intern/cycles/kernel/integrator/integrator_state_flow.h (+21, -20) (Diff)
/intern/cycles/kernel/integrator/integrator_state_util.h (+88, -82) (Diff)
/intern/cycles/kernel/integrator/integrator_subsurface.h (+32, -30) (Diff)
/intern/cycles/kernel/integrator/integrator_subsurface_disk.h (+9, -8) (Diff)
/intern/cycles/kernel/integrator/integrator_subsurface_random_walk.h (+13, -12) (Diff)
/intern/cycles/kernel/integrator/integrator_volume_stack.h (+20, -17) (Diff)
/intern/cycles/kernel/kernel_accumulate.h (+78, -72) (Diff)
/intern/cycles/kernel/kernel_adaptive_sampling.h (+6, -5) (Diff)
/intern/cycles/kernel/kernel_bake.h (+4, -4) (Diff)
/intern/cycles/kernel/kernel_camera.h (+8, -8) (Diff)
/intern/cycles/kernel/kernel_color.h (+2, -2) (Diff)
/intern/cycles/kernel/kernel_emission.h (+9, -10) (Diff)
/intern/cycles/kernel/kernel_id_passes.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_jitter.h (+2, -5) (Diff)
/intern/cycles/kernel/kernel_light.h (+21, -25) (Diff)
/intern/cycles/kernel/kernel_light_background.h (+11, -20) (Diff)
/intern/cycles/kernel/kernel_light_common.h (+1, -4) (Diff)
/intern/cycles/kernel/kernel_lookup_table.h (+2, -5) (Diff)
/intern/cycles/kernel/kernel_passes.h (+32, -27) (Diff)
/intern/cycles/kernel/kernel_path_state.h (+81, -76) (Diff)
/intern/cycles/kernel/kernel_random.h (+4, -4) (Diff)
/intern/cycles/kernel/kernel_shader.h (+45, -45) (Diff)
/intern/cycles/kernel/kernel_shadow_catcher.h (+18, -12) (Diff)
/intern/cycles/kernel/kernel_types.h (+35, -21) (Diff)
/intern/cycles/kernel/osl/osl_closures.cpp (+1, -1) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+19, -19) (Diff)
/intern/cycles/kernel/osl/osl_services.h (+3, -3) (Diff)
/intern/cycles/kernel/osl/osl_shader.cpp (+8, -8) (Diff)
/intern/cycles/kernel/osl/osl_shader.h (+8, -8) (Diff)
/intern/cycles/kernel/svm/svm.h (+54, -32) (Diff)
/intern/cycles/kernel/svm/svm_ao.h (+11, -7) (Diff)
/intern/cycles/kernel/svm/svm_aov.h (+12, -6) (Diff)
/intern/cycles/kernel/svm/svm_attribute.h (+6, -5) (Diff)
/intern/cycles/kernel/svm/svm_bevel.h (+15, -11) (Diff)
/intern/cycles/kernel/svm/svm_blackbody.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_brick.h (+2, -5) (Diff)
/intern/cycles/kernel/svm/svm_bump.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_camera.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_checker.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_clamp.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_closure.h (+26, -14) (Diff)
/intern/cycles/kernel/svm/svm_convert.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_displace.h (+5, -8) (Diff)
/intern/cycles/kernel/svm/svm_geometry.h (+6, -6) (Diff)
/intern/cycles/kernel/svm/svm_hsv.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_ies.h (+3, -6) (Diff)
/intern/cycles/kernel/svm/svm_image.h (+5, -9) (Diff)
/intern/cycles/kernel/svm/svm_light_path.h (+16, -9) (Diff)
/intern/cycles/kernel/svm/svm_magic.h (+2, -5) (Diff)
/intern/cycles/kernel/svm/svm_mapping.h (+3, -3) (Diff)
/intern/cycles/kernel/svm/svm_map_range.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_math.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_mix.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_musgrave.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_noisetex.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_normal.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_ramp.h (+11, -28) (Diff)
/intern/cycles/kernel/svm/svm_sepcomb_hsv.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_sky.h (+5, -8) (Diff)
/intern/cycles/kernel/svm/svm_tex_coord.h (+5, -5) (Diff)
/intern/cycles/kernel/svm/svm_value.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_vector_transform.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_vertex_color.h (+3, -3) (Diff)
/intern/cycles/kernel/svm/svm_voronoi.h (+7, -4) (Diff)
/intern/cycles/kernel/svm/svm_voxel.h (+2, -5) (Diff)
/intern/cycles/kernel/svm/svm_wave.h (+2, -5) (Diff)
/intern/cycles/kernel/svm/svm_wavelength.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_white_noise.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_wireframe.h (+2, -2) (Diff)
/intern/cycles/device/cpu/device_impl.h (+1, -1) (Diff)
/intern/cycles/device/cpu/kernel.h (+10, -10) (Diff)
/intern/cycles/device/cpu/kernel_thread_globals.cpp (+4, -4) (Diff)
/intern/cycles/device/cpu/kernel_thread_globals.h (+4, -4) (Diff)
/intern/cycles/integrator/path_trace_work_cpu.cpp (+2, -2) (Diff)
/intern/cycles/integrator/path_trace_work_cpu.h (+2, -2) (Diff)
/intern/cycles/integrator/shader_eval.cpp (+1, -1) (Diff)
/intern/cycles/kernel/bvh/bvh.h (+5, -5) (Diff)
/intern/cycles/kernel/bvh/bvh_embree.h (+4, -4) (Diff)
/intern/cycles/kernel/bvh/bvh_local.h (+2, -2) (Diff)
/intern/cycles/kernel/bvh/bvh_nodes.h (+5, -5) (Diff)
/intern/cycles/kernel/bvh/bvh_shadow_all.h (+2, -2) (Diff)
/intern/cycles/kernel/bvh/bvh_traversal.h (+2, -2) (Diff)
/intern/cycles/kernel/bvh/bvh_util.h (+10, -10) (Diff)
/intern/cycles/kernel/bvh/bvh_volume.h (+2, -2) (Diff)
/intern/cycles/kernel/bvh/bvh_volume_all.h (+2, -2) (Diff)
/intern/cycles/kernel/closure/bsdf.h (+3, -5) (Diff)
/intern/cycles/kernel/closure/bsdf_hair_principled.h (+4, -4) (Diff)
/intern/cycles/kernel/closure/bsdf_microfacet.h (+4, -4) (Diff)
/intern/cycles/kernel/closure/bsdf_microfacet_multi.h (+2, -2) (Diff)
/intern/cycles/kernel/device/cpu/globals.h (+4, -2) (Diff)
/intern/cycles/kernel/device/cpu/image.h (+2, -2) (Diff)
/intern/cycles/kernel/device/cpu/kernel.cpp (+2, -2) (Diff)
/intern/cycles/kernel/device/cpu/kernel.h (+7, -7) (Diff)
/intern/cycles/kernel/device/cpu/kernel_arch.h (+10, -10) (Diff)
/intern/cycles/kernel/device/cpu/kernel_arch_impl.h (+10, -10) (Diff)
/intern/cycles/kernel/device/cuda/globals.h (+2, -1) (Diff)
/intern/cycles/kernel/device/gpu/image.h (+2, -2) (Diff)
/intern/cycles/kernel/device/gpu/kernel.h (+12, -12) (Diff)
/intern/cycles/kernel/device/optix/globals.h (+2, -1) (Diff)
/intern/cycles/kernel/geom/geom_attribute.h (+5, -7) (Diff)
/intern/cycles/kernel/geom/geom_curve.h (+7, -10) (Diff)
/intern/cycles/kernel/geom/geom_curve_intersect.h (+2, -2) (Diff)
/intern/cycles/kernel/geom/geom_motion_curve.h (+5, -10) (Diff)
/intern/cycles/kernel/geom/geom_motion_triangle.h (+5, -10) (Diff)
/intern/cycles/kernel/geom/geom_motion_triangle_intersect.h (+4, -4) (Diff)
/intern/cycles/kernel/geom/geom_motion_triangle_shader.h (+1, -1) (Diff)
/intern/cycles/kernel/geom/geom_object.h (+42, -47) (Diff)
/intern/cycles/kernel/geom/geom_patch.h (+9, -9) (Diff)
/intern/cycles/kernel/geom/geom_primitive.h (+15, -17) (Diff)
/intern/cycles/kernel/geom/geom_shader_data.h (+6, -7) (Diff)
/intern/cycles/kernel/geom/geom_subd_triangle.h (+10, -14) (Diff)
/intern/cycles/kernel/geom/geom_triangle.h (+12, -17) (Diff)
/intern/cycles/kernel/geom/geom_triangle_intersect.h (+4, -4) (Diff)
/intern/cycles/kernel/geom/geom_volume.h (+2, -2) (Diff)
/intern/cycles/kernel/integrator/integrator_init_from_bake.h (+10, -9) (Diff)
/intern/cycles/kernel/integrator/integrator_init_from_camera.h (+8, -7) (Diff)
/intern/cycles/kernel/integrator/integrator_intersect_closest.h (+30, -28) (Diff)
/intern/cycles/kernel/integrator/integrator_intersect_shadow.h (+22, -20) (Diff)
/intern/cycles/kernel/integrator/integrator_intersect_subsurface.h (+2, -2) (Diff)
/intern/cycles/kernel/integrator/integrator_intersect_volume_stack.h (+13, -12) (Diff)
/intern/cycles/kernel/integrator/integrator_megakernel.h (+16, -15) (Diff)
/intern/cycles/kernel/integrator/integrator_shade_background.h (+38, -36) (Diff)
/intern/cycles/kernel/integrator/integrator_shade_light.h (+20, -18) (Diff)
/intern/cycles/kernel/integrator/integrator_shade_shadow.h (+39, -33) (Diff)
/intern/cycles/kernel/integrator/integrator_shade_surface.h (+102, -94) (Diff)
/intern/cycles/kernel/integrator/integrator_shade_volume.h (+82, -76) (Diff)
/intern/cycles/kernel/integrator/integrator_state.h (+24, -45) (Diff)
/intern/cycles/kernel/integrator/integrator_state_flow.h (+21, -20) (Diff)
/intern/cycles/kernel/integrator/integrator_state_util.h (+88, -82) (Diff)
/intern/cycles/kernel/integrator/integrator_subsurface.h (+32, -30) (Diff)
/intern/cycles/kernel/integrator/integrator_subsurface_disk.h (+9, -8) (Diff)
/intern/cycles/kernel/integrator/integrator_subsurface_random_walk.h (+13, -12) (Diff)
/intern/cycles/kernel/integrator/integrator_volume_stack.h (+20, -17) (Diff)
/intern/cycles/kernel/kernel_accumulate.h (+78, -72) (Diff)
/intern/cycles/kernel/kernel_adaptive_sampling.h (+6, -5) (Diff)
/intern/cycles/kernel/kernel_bake.h (+4, -4) (Diff)
/intern/cycles/kernel/kernel_camera.h (+8, -8) (Diff)
/intern/cycles/kernel/kernel_color.h (+2, -2) (Diff)
/intern/cycles/kernel/kernel_emission.h (+9, -10) (Diff)
/intern/cycles/kernel/kernel_id_passes.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_jitter.h (+2, -5) (Diff)
/intern/cycles/kernel/kernel_light.h (+21, -25) (Diff)
/intern/cycles/kernel/kernel_light_background.h (+11, -20) (Diff)
/intern/cycles/kernel/kernel_light_common.h (+1, -4) (Diff)
/intern/cycles/kernel/kernel_lookup_table.h (+2, -5) (Diff)
/intern/cycles/kernel/kernel_passes.h (+32, -27) (Diff)
/intern/cycles/kernel/kernel_path_state.h (+81, -76) (Diff)
/intern/cycles/kernel/kernel_random.h (+4, -4) (Diff)
/intern/cycles/kernel/kernel_shader.h (+45, -45) (Diff)
/intern/cycles/kernel/kernel_shadow_catcher.h (+18, -12) (Diff)
/intern/cycles/kernel/kernel_types.h (+35, -21) (Diff)
/intern/cycles/kernel/osl/osl_closures.cpp (+1, -1) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+19, -19) (Diff)
/intern/cycles/kernel/osl/osl_services.h (+3, -3) (Diff)
/intern/cycles/kernel/osl/osl_shader.cpp (+8, -8) (Diff)
/intern/cycles/kernel/osl/osl_shader.h (+8, -8) (Diff)
/intern/cycles/kernel/svm/svm.h (+54, -32) (Diff)
/intern/cycles/kernel/svm/svm_ao.h (+11, -7) (Diff)
/intern/cycles/kernel/svm/svm_aov.h (+12, -6) (Diff)
/intern/cycles/kernel/svm/svm_attribute.h (+6, -5) (Diff)
/intern/cycles/kernel/svm/svm_bevel.h (+15, -11) (Diff)
/intern/cycles/kernel/svm/svm_blackbody.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_brick.h (+2, -5) (Diff)
/intern/cycles/kernel/svm/svm_bump.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_camera.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_checker.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_clamp.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_closure.h (+26, -14) (Diff)
/intern/cycles/kernel/svm/svm_convert.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_displace.h (+5, -8) (Diff)
/intern/cycles/kernel/svm/svm_geometry.h (+6, -6) (Diff)
/intern/cycles/kernel/svm/svm_hsv.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_ies.h (+3, -6) (Diff)
/intern/cycles/kernel/svm/svm_image.h (+5, -9) (Diff)
/intern/cycles/kernel/svm/svm_light_path.h (+16, -9) (Diff)
/intern/cycles/kernel/svm/svm_magic.h (+2, -5) (Diff)
/intern/cycles/kernel/svm/svm_mapping.h (+3, -3) (Diff)
/intern/cycles/kernel/svm/svm_map_range.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_math.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_mix.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_musgrave.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_noisetex.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_normal.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_ramp.h (+11, -28) (Diff)
/intern/cycles/kernel/svm/svm_sepcomb_hsv.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_sky.h (+5, -8) (Diff)
/intern/cycles/kernel/svm/svm_tex_coord.h (+5, -5) (Diff)
/intern/cycles/kernel/svm/svm_value.h (+2, -2) (Diff)
/intern/cycles/kernel/svm/svm_vector_transform.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_vertex_color.h (+3, -3) (Diff)
/intern/cycles/kernel/svm/svm_voronoi.h (+7, -4) (Diff)
/intern/cycles/kernel/svm/svm_voxel.h (+2, -5) (Diff)
/intern/cycles/kernel/svm/svm_wave.h (+2, -5) (Diff)
/intern/cycles/kernel/svm/svm_wavelength.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_white_noise.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_wireframe.h (+2, -2) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021