[Bf-blender-cvs] [92e4d602ea2] soc-2022-many-lights-sampling: Fix: align KernelIntegrator and fix MIS

[Jeffrey Liu]

Commit: 92e4d602ea27b9574dd814d8758b2635161487ad
Author: Jeffrey Liu
Date:   Tue Jul 19 20:28:45 2022 -0400
Branches: soc-2022-many-lights-sampling
https://developer.blender.org/rB92e4d602ea27b9574dd814d8758b2635161487ad

Fix: align KernelIntegrator and fix MIS

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

M	intern/cycles/kernel/data_template.h
M	intern/cycles/kernel/integrator/shade_surface.h

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

diff --git a/intern/cycles/kernel/data_template.h b/intern/cycles/kernel/data_template.h
index cccb00c1adc..7339396e92c 100644
--- a/intern/cycles/kernel/data_template.h
+++ b/intern/cycles/kernel/data_template.h
@@ -197,6 +197,7 @@ KERNEL_STRUCT_MEMBER(integrator, int, use_light_tree)
 KERNEL_STRUCT_MEMBER(integrator, float, splitting_threshold)
 /* Padding */
 KERNEL_STRUCT_MEMBER(integrator, int, pad1)
+KERNEL_STRUCT_MEMBER(integrator, int, pad2)
 KERNEL_STRUCT_END(KernelIntegrator)
 
 /* SVM. For shader specialization. */
diff --git a/intern/cycles/kernel/integrator/shade_surface.h b/intern/cycles/kernel/integrator/shade_surface.h
index 13c5e4d780e..7d403a84c1b 100644
--- a/intern/cycles/kernel/integrator/shade_surface.h
+++ b/intern/cycles/kernel/integrator/shade_surface.h
@@ -86,7 +86,6 @@ ccl_device_forceinline void integrate_surface_emission(KernelGlobals kg,
     if (kernel_data.integrator.use_light_tree) {
       float3 ray_P = INTEGRATOR_STATE(state, ray, P);
       const float3 ray_D = INTEGRATOR_STATE(state, ray, D);
-      ray_P -= ray_D * mis_ray_t;
       const float3 N = INTEGRATOR_STATE(state, path, mis_origin_n);
       pdf *= light_tree_pdf(kg, ray_P, N, sd->prim);
     }