[Bf-blender-cvs] [9a30e4b21c2] cycles_path_guiding: Cleanup: change assert to kernel_assert

[Brecht Van Lommel]

Commit: 9a30e4b21c233de37a2a771936087db1153b5991
Author: Brecht Van Lommel
Date:   Thu Aug 11 14:08:58 2022 +0200
Branches: cycles_path_guiding
https://developer.blender.org/rB9a30e4b21c233de37a2a771936087db1153b5991

Cleanup: change assert to kernel_assert

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

M	intern/cycles/kernel/closure/bsdf_microfacet_multi.h
M	intern/cycles/kernel/integrator/guiding.h
M	intern/cycles/kernel/integrator/shade_volume.h

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

diff --git a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h
index dcfb10c4886..8fad552cf4e 100644
--- a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h
@@ -561,7 +561,7 @@ ccl_device int bsdf_microfacet_multi_ggx_sample(KernelGlobals kg,
   else
     *pdf = mf_ggx_pdf(localI, localO, bsdf->alpha_x);
   *pdf = fmaxf(0.f, *pdf);
-  // assert(*pdf >= 0.f);
+  // kernel_assert(*pdf >= 0.f);
   *eval *= *pdf;
 
 #ifdef __RAY_DIFFERENTIALS__
@@ -623,7 +623,7 @@ bsdf_microfacet_multi_ggx_glass_eval_transmit(ccl_private const ShaderClosure *s
   float3 localO = make_float3(dot(omega_in, X), dot(omega_in, Y), dot(omega_in, Z));
 
   *pdf = mf_glass_pdf(localI, localO, bsdf->alpha_x, bsdf->ior);
-  assert(*pdf >= 0.f);
+  kernel_assert(*pdf >= 0.f);
   return mf_eval_glass(localI,
                        localO,
                        false,
@@ -660,7 +660,7 @@ bsdf_microfacet_multi_ggx_glass_eval_reflect(ccl_private const ShaderClosure *sc
   float3 localO = make_float3(dot(omega_in, X), dot(omega_in, Y), dot(omega_in, Z));
 
   *pdf = mf_glass_pdf(localI, localO, bsdf->alpha_x, bsdf->ior);
-  assert(*pdf >= 0.f);
+  kernel_assert(*pdf >= 0.f);
   return mf_eval_glass(localI,
                        localO,
                        true,
@@ -756,7 +756,7 @@ ccl_device int bsdf_microfacet_multi_ggx_glass_sample(KernelGlobals kg,
                           use_fresnel,
                           bsdf->extra->cspec0);
   *pdf = mf_glass_pdf(localI, localO, bsdf->alpha_x, bsdf->ior);
-  assert(*pdf >= 0.f);
+  kernel_assert(*pdf >= 0.f);
   *eval *= *pdf;
 
   *omega_in = X * localO.x + Y * localO.y + Z * localO.z;
diff --git a/intern/cycles/kernel/integrator/guiding.h b/intern/cycles/kernel/integrator/guiding.h
index 540d784e467..c68ff7a8487 100644
--- a/intern/cycles/kernel/integrator/guiding.h
+++ b/intern/cycles/kernel/integrator/guiding.h
@@ -80,7 +80,7 @@ ccl_device_forceinline void guiding_add_bsdf_data(IntegratorState state,
                                               clamp(bsdf_shading_normal[1], -1.f, 1.f),
                                               clamp(bsdf_shading_normal[2], -1.f, 1.f));
 
-  assert(state->guiding.path_segment != nullptr);
+  kernel_assert(state->guiding.path_segment != nullptr);
 
   openpgl::cpp::SetTransmittanceWeight(state->guiding.path_segment,
                                        openpgl::cpp::Vector3(1.0f, 1.0f, 1.0f));
@@ -129,7 +129,7 @@ ccl_device_forceinline void guiding_add_bssrdf_data(IntegratorState state,
                                               clamp(bssrdf_shading_normal[1], -1.f, 1.f),
                                               clamp(bssrdf_shading_normal[2], -1.f, 1.f));
 
-  assert(state->guiding.path_segment != nullptr);
+  kernel_assert(state->guiding.path_segment != nullptr);
 
   openpgl::cpp::SetTransmittanceWeight(state->guiding.path_segment,
                                        openpgl::cpp::Vector3(1.0f, 1.0f, 1.0f));
@@ -177,7 +177,7 @@ ccl_device_forceinline void guiding_add_phase_data(IntegratorState state,
       phase_weight_rgb[0], phase_weight_rgb[1], phase_weight_rgb[2]);
   pgl_vec3f pglNormal = openpgl::cpp::Vector3(0.f, 0.f, 1.f);
 
-  assert(state->guiding.path_segment != nullptr);
+  kernel_assert(state->guiding.path_segment != nullptr);
 
   openpgl::cpp::SetVolumeScatter(state->guiding.path_segment, true);
   openpgl::cpp::SetTransmittanceWeight(state->guiding.path_segment,
diff --git a/intern/cycles/kernel/integrator/shade_volume.h b/intern/cycles/kernel/integrator/shade_volume.h
index 169f46753eb..a9cc2c5c37c 100644
--- a/intern/cycles/kernel/integrator/shade_volume.h
+++ b/intern/cycles/kernel/integrator/shade_volume.h
@@ -1097,7 +1097,7 @@ ccl_device_inline void shader_prepare_volume_guiding(KernelGlobals kg,
     }
   }
 
-  assert(guiding_sampling_prob >= 0.f && guiding_sampling_prob <= 1.0f);
+  kernel_assert(guiding_sampling_prob >= 0.f && guiding_sampling_prob <= 1.0f);
   state->guiding.volume_guiding_sampling_prob = guiding_sampling_prob;
   state->guiding.use_volume_guiding = useGuiding;
   state->guiding.sample_volume_guiding_rand = grand;