cook torrance bsdf can use spectral fresnel, uses interaction.getPrefixThroughputWeights

Author: keptsecret

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

@@ -167,8 +167,8 @@ struct SCookTorrance
 
         NBL_IF_CONSTEXPR(IsBSDF)
         {
-            const scalar_type reflectance = _f(clampedVdotH)[0];
-            return hlsl::promote<spectral_type>(hlsl::mix(reflectance, scalar_type(1.0) - reflectance, cache.isTransmission())) * DG;
+            const spectral_type reflectance = impl::__implicit_promote<spectral_type, typename fresnel_type::vector_type>::__call(_f(clampedVdotH));
+            return hlsl::mix(reflectance, hlsl::promote<spectral_type>(1.0) - reflectance, cache.isTransmission()) * DG;
         }
         else
             return impl::__implicit_promote<spectral_type, typename fresnel_type::vector_type>::__call(_f(clampedVdotH)) * DG;
@@ -271,7 +271,9 @@ struct SCookTorrance
         {
             assert(NdotV*VdotH >= scalar_type(0.0));
         }
-        const scalar_type reflectance = _f(hlsl::abs(VdotH))[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);
 
         scalar_type rcpChoiceProb;
         scalar_type z = u.z;
@@ -312,7 +314,8 @@ struct SCookTorrance
 
         NBL_IF_CONSTEXPR(IsBSDF)
         {
-            const scalar_type reflectance = _f(hlsl::abs(cache.getVdotH()))[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(cache.getVdotH()))), prefixThroughputWeights);
             return hlsl::mix(reflectance, scalar_type(1.0) - reflectance, cache.isTransmission()) * DG1.projectedLightMeasure;
         }
         else
@@ -359,7 +362,13 @@ struct SCookTorrance
 
         spectral_type quo;
         NBL_IF_CONSTEXPR(IsBSDF)
-            quo = hlsl::promote<spectral_type>(G2_over_G1);
+        {
+            spectral_type prefixThroughputWeights = interaction.getPrefixThroughputWeights();
+            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);
+            quo = hlsl::mix(reflectance / scaled_reflectance,
+                    (hlsl::promote<spectral_type>(1.0) - reflectance) / (scalar_type(1.0) - scaled_reflectance), cache.isTransmission()) * G2_over_G1;
+        }
         else
         {
             const scalar_type VdotH = cache.getVdotH();

include/nbl/builtin/hlsl/math/functions.hlsl

@@ -33,9 +33,9 @@ struct lp_norm<T,0,false NBL_PARTIAL_REQ_BOT(concepts::FloatingPointLikeVectoria
     {
         array_get<T, scalar_type> getter;
 
-        scalar_type retval = abs<T>(getter(v, 0));
-        for (int i = 1; i < extent<T>::value; i++)
-            retval = max<T>(abs<T>(getter(v, i)),retval);
+        scalar_type retval = abs<scalar_type>(getter(v, 0));
+        for (int i = 1; i < vector_traits<T>::Dimension; i++)
+            retval = max<scalar_type>(abs<scalar_type>(getter(v, i)),retval);
         return retval;
     }
 };
@@ -49,9 +49,9 @@ struct lp_norm<T,1,true NBL_PARTIAL_REQ_BOT(concepts::FloatingPointLikeVectorial
     {
         array_get<T, scalar_type> getter;
 
-        scalar_type retval = abs<T>(getter(v, 0));
-        for (int i = 1; i < extent<T>::value; i++)
-            retval += abs<T>(getter(v, i));
+        scalar_type retval = abs<scalar_type>(getter(v, 0));
+        for (int i = 1; i < vector_traits<T>::Dimension; i++)
+            retval += abs<scalar_type>(getter(v, i));
         return retval;
     }