[Bf-blender-cvs] [2006c3ed106] master: Fix T101529: Blender crashes when using Path Guiding

[Sebastian Herholz]

Commit: 2006c3ed106d7d7931c6f76704765b3842c34fec
Author: Sebastian Herholz
Date:   Tue Oct 18 13:59:12 2022 +0200
Branches: master
https://developer.blender.org/rB2006c3ed106d7d7931c6f76704765b3842c34fec

Fix T101529: Blender crashes when using Path Guiding

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

M       intern/cycles/integrator/path_trace.cpp
M       intern/cycles/kernel/integrator/state_flow.h

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

diff --git a/intern/cycles/integrator/path_trace.cpp 
b/intern/cycles/integrator/path_trace.cpp
index 506d962f13d..8e8fbd86be0 100644
--- a/intern/cycles/integrator/path_trace.cpp
+++ b/intern/cycles/integrator/path_trace.cpp
@@ -1296,6 +1296,7 @@ void PathTrace::set_guiding_params(const GuidingParams 
&guiding_params, const bo
 #  if OPENPGL_VERSION_MINOR >= 4
       field_args.deterministic = guiding_params.deterministic;
 #  endif
+      reinterpret_cast<PGLKDTreeArguments 
*>(field_args.spatialSturctureArguments)->maxDepth = 16;
       openpgl::cpp::Device *guiding_device = static_cast<openpgl::cpp::Device 
*>(
           device_->get_guiding_device());
       if (guiding_device) {
diff --git a/intern/cycles/kernel/integrator/state_flow.h 
b/intern/cycles/kernel/integrator/state_flow.h
index 4b03c665e17..40961b1c5fb 100644
--- a/intern/cycles/kernel/integrator/state_flow.h
+++ b/intern/cycles/kernel/integrator/state_flow.h
@@ -76,6 +76,9 @@ ccl_device_forceinline IntegratorShadowState 
integrator_shadow_path_init(
       &kernel_integrator_state.next_shadow_path_index[0], 1);
   
atomic_fetch_and_add_uint32(&kernel_integrator_state.queue_counter->num_queued[next_kernel],
 1);
   INTEGRATOR_STATE_WRITE(shadow_state, shadow_path, queued_kernel) = 
next_kernel;
+#  ifdef __PATH_GUIDING__
+  INTEGRATOR_STATE_WRITE(shadow_state, shadow_path, path_segment) = nullptr;
+#  endif
   return shadow_state;
 }
 
@@ -181,6 +184,9 @@ ccl_device_forceinline IntegratorShadowState 
integrator_shadow_path_init(
 {
   IntegratorShadowState shadow_state = (is_ao) ? &state->ao : &state->shadow;
   INTEGRATOR_STATE_WRITE(shadow_state, shadow_path, queued_kernel) = 
next_kernel;
+#  ifdef __PATH_GUIDING__
+  INTEGRATOR_STATE_WRITE(shadow_state, shadow_path, path_segment) = nullptr;
+#  endif
   return shadow_state;
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs