removed redundant weight in interaction

Author: keptsecret

include/nbl/builtin/hlsl/bxdf/base/cook_torrance_base.hlsl

@@ -282,8 +282,8 @@ struct SCookTorrance
             assert(NdotV*VdotH >= scalar_type(0.0));
         }
 
-        spectral_type prefixThroughputWeights = interaction.getPrefixThroughputWeights();
-        const scalar_type reflectance = hlsl::dot(impl::__implicit_promote<spectral_type, typename fresnel_type::vector_type>::__call(_f(hlsl::abs(VdotH))), prefixThroughputWeights);
+        spectral_type throughputWeights = interaction.getLuminosityContributionHint();
+        const scalar_type reflectance = hlsl::dot(impl::__implicit_promote<spectral_type, typename fresnel_type::vector_type>::__call(_f(hlsl::abs(VdotH))), throughputWeights);
 
         scalar_type rcpChoiceProb;
         scalar_type z = u.z;
@@ -324,8 +324,8 @@ struct SCookTorrance
 
         NBL_IF_CONSTEXPR(IsBSDF)
         {
-            spectral_type prefixThroughputWeights = interaction.getPrefixThroughputWeights();
-            const scalar_type reflectance = hlsl::dot(impl::__implicit_promote<spectral_type, typename fresnel_type::vector_type>::__call(_f(hlsl::abs(cache.getVdotH()))), prefixThroughputWeights);
+            spectral_type throughputWeights = interaction.getLuminosityContributionHint();
+            const scalar_type reflectance = hlsl::dot(impl::__implicit_promote<spectral_type, typename fresnel_type::vector_type>::__call(_f(hlsl::abs(cache.getVdotH()))), throughputWeights);
             return hlsl::mix(reflectance, scalar_type(1.0) - reflectance, cache.isTransmission()) * DG1.projectedLightMeasure;
         }
         else
@@ -373,9 +373,9 @@ struct SCookTorrance
         spectral_type quo;
         NBL_IF_CONSTEXPR(IsBSDF)
         {
-            spectral_type prefixThroughputWeights = interaction.getPrefixThroughputWeights();
+            spectral_type throughputWeights = interaction.getLuminosityContributionHint();
             spectral_type reflectance = impl::__implicit_promote<spectral_type, typename fresnel_type::vector_type>::__call(_f(hlsl::abs(cache.getVdotH())));
-            const scalar_type scaled_reflectance = hlsl::dot(reflectance, prefixThroughputWeights);
+            const scalar_type scaled_reflectance = hlsl::dot(reflectance, throughputWeights);
             quo = hlsl::mix(reflectance / scaled_reflectance,
                     (hlsl::promote<spectral_type>(1.0) - reflectance) / (scalar_type(1.0) - scaled_reflectance), cache.isTransmission()) * G2_over_G1;
         }

include/nbl/builtin/hlsl/bxdf/common.hlsl

@@ -195,7 +195,6 @@ NBL_CONCEPT_END(
     ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((iso.getNdotV2()), ::nbl::hlsl::is_same_v, typename T::scalar_type))
     ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((iso.getPathOrigin()), ::nbl::hlsl::is_same_v, PathOrigin))
     ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((iso.getLuminosityContributionHint()), ::nbl::hlsl::is_same_v, typename T::spectral_type))
-    ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((iso.getPrefixThroughputWeights()), ::nbl::hlsl::is_same_v, typename T::spectral_type))
     ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((T::create(normV,normN)), ::nbl::hlsl::is_same_v, T))
     ((NBL_CONCEPT_REQ_TYPE_ALIAS_CONCEPT)(ray_dir_info::Basic, typename T::ray_dir_info_type))
 );
@@ -223,7 +222,6 @@ struct SIsotropic
         retval.NdotV = nbl::hlsl::dot<vector3_type>(retval.N, retval.V.getDirection());
         retval.NdotV2 = retval.NdotV * retval.NdotV;
         retval.luminosityContributionHint = hlsl::promote<spectral_type>(1.0);
-        retval.throughputWeights = hlsl::promote<spectral_type>(1.0);
 
         return retval;
     }
@@ -238,19 +236,13 @@ struct SIsotropic
 
     PathOrigin getPathOrigin() NBL_CONST_MEMBER_FUNC { return PathOrigin::PO_SENSOR; }
     spectral_type getLuminosityContributionHint() NBL_CONST_MEMBER_FUNC { return luminosityContributionHint; }
-    spectral_type getPrefixThroughputWeights() NBL_CONST_MEMBER_FUNC
-    {
-        spectral_type prefixThroughputWeights = luminosityContributionHint * throughputWeights;
-        return prefixThroughputWeights / math::lpNorm<spectral_type,1>(prefixThroughputWeights);
-    }
 
     RayDirInfo V;
     vector3_type N;
     scalar_type NdotV;
     scalar_type NdotV2;
 
     spectral_type luminosityContributionHint;
-    spectral_type throughputWeights;    // product of all quotients so far
 };
 
 #define NBL_CONCEPT_NAME Anisotropic
@@ -337,7 +329,6 @@ struct SAnisotropic
     scalar_type getNdotV2() NBL_CONST_MEMBER_FUNC { return isotropic.getNdotV2(); }
     PathOrigin getPathOrigin() NBL_CONST_MEMBER_FUNC { return isotropic.getPathOrigin(); }
     spectral_type getLuminosityContributionHint() NBL_CONST_MEMBER_FUNC { return isotropic.getLuminosityContributionHint(); }
-    spectral_type getPrefixThroughputWeights() NBL_CONST_MEMBER_FUNC { return isotropic.getPrefixThroughputWeights(); }
 
     vector3_type getT() NBL_CONST_MEMBER_FUNC { return T; }
     vector3_type getB() NBL_CONST_MEMBER_FUNC { return B; }