refactor: delete BSDF from SurfaceInteraction::SpawnRay() as it was n…

…ever used
mmp · Nov 23, 2024 · 805add6 · 805add6
1 parent 1ae72cf
commit 805add6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/pbrt/cpu/integrators.cpp b/src/pbrt/cpu/integrators.cpp
@@ -592,7 +592,7 @@ void LightPathIntegrator::EvaluatePixelSample(Point2i pPixel, int sampleIndex,
         if (!bs)
             break;
         beta *= bs->f * AbsDot(bs->wi, isect.shading.n) / bs->pdf;
-        ray = isect.SpawnRay(ray, bsdf, bs->wi, bs->flags, bs->eta);
+        ray = isect.SpawnRay(ray, bs->wi, bs->flags, bs->eta);
     }
 }
 
@@ -745,7 +745,7 @@ SampledSpectrum PathIntegrator::Li(RayDifferential ray, SampledWavelengths &lamb
             etaScale *= Sqr(bs->eta);
         prevIntrCtx = si->intr;
 
-        ray = isect.SpawnRay(ray, bsdf, bs->wi, bs->flags, bs->eta);
+        ray = isect.SpawnRay(ray, bs->wi, bs->flags, bs->eta);
 
         // Possibly terminate the path with Russian roulette
         SampledSpectrum rrBeta = beta * etaScale;
@@ -1182,7 +1182,7 @@ SampledSpectrum VolPathIntegrator::Li(RayDifferential ray, SampledWavelengths &l
         anyNonSpecularBounces |= !bs->IsSpecular();
         if (bs->IsTransmission())
             etaScale *= Sqr(bs->eta);
-        ray = isect.SpawnRay(ray, bsdf, bs->wi, bs->flags, bs->eta);
+        ray = isect.SpawnRay(ray, bs->wi, bs->flags, bs->eta);
 
         // Account for attenuated subsurface scattering, if applicable
         BSSRDF bssrdf = isect.GetBSSRDF(ray, lambda, camera, scratchBuffer);
@@ -2096,7 +2096,7 @@ int RandomWalk(const Integrator &integrator, SampledWavelengths &lambda,
         pdfFwd = bs->pdfIsProportional ? bsdf.PDF(wo, bs->wi, mode) : bs->pdf;
         anyNonSpecularBounces |= !bs->IsSpecular();
         beta *= bs->f * AbsDot(bs->wi, isect.shading.n) / bs->pdf;
-        ray = isect.SpawnRay(ray, bsdf, bs->wi, bs->flags, bs->eta);
+        ray = isect.SpawnRay(ray, bs->wi, bs->flags, bs->eta);
 
         // Compute path probabilities at surface vertex
         // TODO: confirm. I believe that !mode is right. Interestingly,
@@ -2988,7 +2988,7 @@ void SPPMIntegrator::Render() {
                             break;
                         beta /= 1 - q;
                     }
-                    ray = isect.SpawnRay(ray, bsdf, bs->wi, bs->flags, bs->eta);
+                    ray = isect.SpawnRay(ray, bs->wi, bs->flags, bs->eta);
                     prevIntrCtx = LightSampleContext(isect);
                 }
             }

diff --git a/src/pbrt/interaction.cpp b/src/pbrt/interaction.cpp
@@ -97,7 +97,7 @@ PBRT_CPU_GPU void SurfaceInteraction::SkipIntersection(RayDifferential *ray, Flo
 }
 
 PBRT_CPU_GPU RayDifferential SurfaceInteraction::SpawnRay(const RayDifferential &rayi,
-                                             const BSDF &bsdf, Vector3f wi, int flags,
+                                             Vector3f wi, int flags,
                                              Float eta) const {
     RayDifferential rd(SpawnRay(wi));
     if (rayi.hasDifferentials) {

diff --git a/src/pbrt/interaction.h b/src/pbrt/interaction.h
@@ -237,7 +237,7 @@ class SurfaceInteraction : public Interaction {
 
     using Interaction::SpawnRay;
     PBRT_CPU_GPU
-    RayDifferential SpawnRay(const RayDifferential &rayi, const BSDF &bsdf, Vector3f wi,
+    RayDifferential SpawnRay(const RayDifferential &rayi, Vector3f wi,
                              int /*BxDFFlags*/ flags, Float eta) const;
 
     BSDF GetBSDF(const RayDifferential &ray, SampledWavelengths &lambda, Camera camera,