[Bf-blender-cvs] [5d8c94526d4] soc-2022-many-lights-sampling: Merge branch 'master' into soc-2023-many-lights-sampling

[Weizhen Huang]

Commit: 5d8c94526d44a56827fdf7babeb92f87ef3c176a
Author: Weizhen Huang
Date:   Tue Oct 4 14:34:05 2022 +0200
Branches: soc-2022-many-lights-sampling
https://developer.blender.org/rB5d8c94526d44a56827fdf7babeb92f87ef3c176a

Merge branch 'master' into soc-2023-many-lights-sampling

===================================================================



===================================================================

diff --cc intern/cycles/blender/addon/ui.py
index 789bd805d6a,f763fe0eb0b..86d50976fe6
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@@ -2315,8 -2349,9 +2378,10 @@@ classes = 
      CYCLES_RENDER_PT_sampling_viewport_denoise,
      CYCLES_RENDER_PT_sampling_render,
      CYCLES_RENDER_PT_sampling_render_denoise,
+     CYCLES_RENDER_PT_sampling_path_guiding,
+     CYCLES_RENDER_PT_sampling_path_guiding_debug,
      CYCLES_RENDER_PT_sampling_advanced,
 +    CYCLES_RENDER_PT_sampling_light_tree,
      CYCLES_RENDER_PT_light_paths,
      CYCLES_RENDER_PT_light_paths_max_bounces,
      CYCLES_RENDER_PT_light_paths_clamping,
diff --cc intern/cycles/kernel/data_template.h
index 8b480db895c,1e9e25f2f9d..9b133d23ed2
--- a/intern/cycles/kernel/data_template.h
+++ b/intern/cycles/kernel/data_template.h
@@@ -192,12 -194,17 +196,21 @@@ KERNEL_STRUCT_MEMBER(integrator, int, h
  KERNEL_STRUCT_MEMBER(integrator, int, filter_closures)
  /* MIS debugging. */
  KERNEL_STRUCT_MEMBER(integrator, int, direct_light_sampling_type)
 -
 +/* Light tree. */
 +KERNEL_STRUCT_MEMBER(integrator, int, use_light_tree)
 +KERNEL_STRUCT_MEMBER(integrator, float, splitting_threshold)
+ /* Path Guiding */
+ KERNEL_STRUCT_MEMBER(integrator, float, surface_guiding_probability)
+ KERNEL_STRUCT_MEMBER(integrator, float, volume_guiding_probability)
+ KERNEL_STRUCT_MEMBER(integrator, int, guiding_distribution_type)
+ KERNEL_STRUCT_MEMBER(integrator, int, use_guiding)
+ KERNEL_STRUCT_MEMBER(integrator, int, train_guiding)
+ KERNEL_STRUCT_MEMBER(integrator, int, use_surface_guiding)
+ KERNEL_STRUCT_MEMBER(integrator, int, use_volume_guiding)
+ KERNEL_STRUCT_MEMBER(integrator, int, use_guiding_direct_light)
+ KERNEL_STRUCT_MEMBER(integrator, int, use_guiding_mis_weights)
 +/* Padding */
 +KERNEL_STRUCT_MEMBER(integrator, int, pad1)
- KERNEL_STRUCT_MEMBER(integrator, int, pad2)
  KERNEL_STRUCT_END(KernelIntegrator)
  
  /* SVM. For shader specialization. */
diff --cc intern/cycles/kernel/integrator/shade_surface.h
index b6fe5534aaa,067d35ef9e3..9dbeb804f12
--- a/intern/cycles/kernel/integrator/shade_surface.h
+++ b/intern/cycles/kernel/integrator/shade_surface.h
@@@ -422,9 -441,8 +466,9 @@@ ccl_device_forceinline int integrate_su
    /* Update path state */
    if (!(label & LABEL_TRANSPARENT)) {
      INTEGRATOR_STATE_WRITE(state, path, mis_ray_pdf) = bsdf_pdf;
 +    INTEGRATOR_STATE_WRITE(state, path, mis_origin_n) = sd->N;
      INTEGRATOR_STATE_WRITE(state, path, min_ray_pdf) = fminf(
-         bsdf_pdf, INTEGRATOR_STATE(state, path, min_ray_pdf));
+         unguided_bsdf_pdf, INTEGRATOR_STATE(state, path, min_ray_pdf));
    }
  
    path_state_next(kg, state, label);