[Bf-blender-cvs] [bf0075f8867] microfacet_hair: Cleanup: delete unused variables

Weizhen Huang noreply at git.blender.org
Mon Dec 19 20:12:04 CET 2022


Commit: bf0075f88670062e0858876d5f9e126dc48b37c4
Author: Weizhen Huang
Date:   Mon Dec 19 19:22:29 2022 +0100
Branches: microfacet_hair
https://developer.blender.org/rBbf0075f88670062e0858876d5f9e126dc48b37c4

Cleanup: delete unused variables

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

M	intern/cycles/kernel/closure/bsdf_hair_microfacet.h

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

diff --git a/intern/cycles/kernel/closure/bsdf_hair_microfacet.h b/intern/cycles/kernel/closure/bsdf_hair_microfacet.h
index 6d754c533d1..0f19cd83af6 100644
--- a/intern/cycles/kernel/closure/bsdf_hair_microfacet.h
+++ b/intern/cycles/kernel/closure/bsdf_hair_microfacet.h
@@ -397,10 +397,7 @@ ccl_device float3 bsdf_microfacet_hair_eval_r_circular(ccl_private const ShaderC
 
     integral = roughness_squared * M_1_PI_F * 0.5f * (temp1 + temp2 + temp3 + temp4);
   }
-  else {
-    /* falls back to numerical integration */
-    const float phi_i = dir_phi(wi);
-
+  else { /* falls back to numerical integration */
     /* initial sample resolution */
     float res = roughness * .7f;
     const float scale = (phi_m_max - phi_m_min) * .5f;
@@ -457,8 +454,6 @@ ccl_device float3 bsdf_microfacet_hair_eval_tt_trt_circular(KernelGlobals kg,
   if (isnan_safe(tmp1))
     return zero_float3();
 
-  const float phi_i = dir_phi(wi);
-
   const float3 mu_a = bsdf->sigma;
   const float inv_eta = 1.f / eta;
 
@@ -880,8 +875,6 @@ ccl_device float3 bsdf_microfacet_hair_eval_r_elliptic(ccl_private const ShaderC
   if (gamma_m_max < gamma_m_min)
     gamma_m_max += M_2PI_F;
 
-  const float gamma_i = to_gamma(phi_i, a, b);
-
   /* initial sample resolution */
   float res = roughness * .7f;
   const float scale = (gamma_m_max - gamma_m_min) * .5f;
@@ -962,8 +955,6 @@ ccl_device float3 bsdf_microfacet_hair_eval_tt_trt_elliptic(KernelGlobals kg,
   if (gamma_m_max < gamma_m_min)
     gamma_m_max += M_2PI_F;
 
-  const float gamma_i = to_gamma(phi_i, a, b);
-
   float res = roughness * .8f;
   const float scale = (gamma_m_max - gamma_m_min) * .5f;
   size_t intervals = 2 * (size_t)ceilf(scale / res) + 1;



More information about the Bf-blender-cvs mailing list