Hlsl bxdfs 3

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

@@ -634,7 +634,7 @@ NBL_CONCEPT_END(
     ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((cache.getBdotH()), ::nbl::hlsl::is_same_v, typename T::scalar_type))
     ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((cache.getBdotH2()), ::nbl::hlsl::is_same_v, typename T::scalar_type))
     ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((T::createForReflection(V,V)), ::nbl::hlsl::is_same_v, T))
-    ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((T::create(V,V,b0,rcp_eta)), ::nbl::hlsl::is_same_v, T))
+    // ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((T::create(V,V,b0,rcp_eta)), ::nbl::hlsl::is_same_v, T))    // TODO: refuses to compile when arg4 is rcp_eta for some reason, eta is fine
     ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((T::createForReflection(V,V,pNdotL)), ::nbl::hlsl::is_same_v, T))
     ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((T::template createForReflection<surface_interactions::SAnisotropic<surface_interactions::SIsotropic<ray_dir_info::SBasic<typename T::scalar_type> > >,SLightSample<ray_dir_info::SBasic<typename T::scalar_type> > >(aniso,_sample)), ::nbl::hlsl::is_same_v, T))
     ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((T::create(V,V,V,V,V,eta,V)), ::nbl::hlsl::is_same_v, T))
@@ -682,11 +682,11 @@ struct SAnisotropicMicrofacetCache
         NBL_CONST_REF_ARG(fresnel::OrientedEtaRcps<monochrome_type>) rcpOrientedEta
     )
     {
-        this_t retval = create(tangentSpaceV,tangentSpaceH);
+        this_t retval = createForReflection(tangentSpaceV,tangentSpaceH);
         if (transmitted)
         {
-            const scalar_type VdotH = retval.iso_cache.VdotH;
-            retval.iso_cache.LdotH = refract_compute_NdotT(VdotH<0.0,VdotH*VdotH,rcpOrientedEta.value2);
+            Refract<scalar_type> r = Refract<scalar_type>::create(tangentSpaceV, tangentSpaceH);
+            retval.iso_cache.LdotH = r.getNdotT(rcpOrientedEta.value2[0]);
         }
 
         return retval;

include/nbl/builtin/hlsl/bxdf/config.hlsl

@@ -103,10 +103,8 @@ template<class LS, class Interaction, class MicrofacetCache, class Spectrum NBL_
 struct SMicrofacetConfiguration;
 
 template<class LS, class Interaction, class MicrofacetCache, class Spectrum>
-NBL_PARTIAL_REQ_TOP(LightSample<LS> && surface_interactions::Isotropic<Interaction> && !surface_interactions::Anisotropic<Interaction> && 
-    CreatableIsotropicMicrofacetCache<MicrofacetCache> && !AnisotropicMicrofacetCache<MicrofacetCache> && concepts::FloatingPointLikeVectorial<Spectrum>)
-struct SMicrofacetConfiguration<LS,Interaction,MicrofacetCache,Spectrum NBL_PARTIAL_REQ_BOT(LightSample<LS> && surface_interactions::Isotropic<Interaction> && !surface_interactions::Anisotropic<Interaction> && 
-    CreatableIsotropicMicrofacetCache<MicrofacetCache> && !AnisotropicMicrofacetCache<MicrofacetCache> && concepts::FloatingPointLikeVectorial<Spectrum>) >
+NBL_PARTIAL_REQ_TOP(LightSample<LS> && surface_interactions::Isotropic<Interaction> && !surface_interactions::Anisotropic<Interaction> && CreatableIsotropicMicrofacetCache<MicrofacetCache> && !AnisotropicMicrofacetCache<MicrofacetCache> && concepts::FloatingPointLikeVectorial<Spectrum>)
+struct SMicrofacetConfiguration<LS,Interaction,MicrofacetCache,Spectrum NBL_PARTIAL_REQ_BOT(LightSample<LS> && surface_interactions::Isotropic<Interaction> && !surface_interactions::Anisotropic<Interaction> && CreatableIsotropicMicrofacetCache<MicrofacetCache> && !AnisotropicMicrofacetCache<MicrofacetCache> && concepts::FloatingPointLikeVectorial<Spectrum>) >
 {
     NBL_CONSTEXPR_STATIC_INLINE bool IsAnisotropic = false;
 
@@ -118,12 +116,12 @@ struct SMicrofacetConfiguration<LS,Interaction,MicrofacetCache,Spectrum NBL_PART
     using monochrome_type = vector<scalar_type, 1>;
 
     using isotropic_interaction_type = Interaction;
-    using anisotropic_interaction_type = surface_interactions::SAnisotropic<isotropic_interaction_type>;
+    using anisotropic_interaction_type = surface_interactions::SAnisotropic<Interaction>;
     using sample_type = LS;
     using spectral_type = Spectrum;
     using quotient_pdf_type = sampling::quotient_and_pdf<spectral_type, scalar_type>;
     using isocache_type = MicrofacetCache;
-    using anisocache_type = SAnisotropicMicrofacetCache<isocache_type>;
+    using anisocache_type = SAnisotropicMicrofacetCache<MicrofacetCache>;
 };
 
 template<class LS, class Interaction, class MicrofacetCache, class Spectrum>

include/nbl/builtin/hlsl/bxdf/fresnel.hlsl

@@ -49,7 +49,7 @@ struct OrientedEtaRcps
         OrientedEtaRcps<T> retval;
         const bool backside = NdotI < scalar_type(0.0);
         const T rcpEta = hlsl::promote<T>(1.0) / eta;
-        retval.value = backside ? eta : rcpEta;
+        retval.value = hlsl::mix(rcpEta, eta, backside);
         retval.value2 = retval.value * retval.value;
         return retval;
     }
@@ -76,8 +76,8 @@ struct OrientedEtas
         OrientedEtas<T> retval;
         const bool backside = NdotI < scalar_type(0.0);
         const T rcpEta = hlsl::promote<T>(1.0) / eta;
-        retval.value = backside ? rcpEta : eta;
-        retval.rcp = backside ? eta : rcpEta;
+        retval.value = hlsl::mix(eta, rcpEta, backside);
+        retval.rcp = hlsl::mix(rcpEta, eta, backside);
         return retval;
     }
 
@@ -208,7 +208,6 @@ struct Refract
 {
     using this_t = Refract<T>;
     using vector_type = vector<T, 3>;
-    using monochrome_type = vector<T, 1>;
     using scalar_type = T;
 
     static this_t create(NBL_CONST_REF_ARG(vector_type) I, NBL_CONST_REF_ARG(vector_type) N)

include/nbl/builtin/hlsl/bxdf/reflection/beckmann.hlsl

@@ -142,7 +142,7 @@ struct SBeckmannIsotropicBxDF
     using anisotropic_interaction_type = typename Config::anisotropic_interaction_type;
     using sample_type = typename Config::sample_type;
     using spectral_type = typename Config::spectral_type;
-    using quotient_pdf_type = sampling::quotient_and_pdf<spectral_type, scalar_type>;
+    using quotient_pdf_type = typename Config::quotient_pdf_type;
     using isocache_type = typename Config::isocache_type;
     using anisocache_type = typename Config::anisocache_type;
 
@@ -257,7 +257,7 @@ struct SBeckmannAnisotropicBxDF<Config NBL_PARTIAL_REQ_BOT(config_concepts::Micr
     using anisotropic_interaction_type = typename Config::anisotropic_interaction_type;
     using sample_type = typename Config::sample_type;
     using spectral_type = typename Config::spectral_type;
-    using quotient_pdf_type = sampling::quotient_and_pdf<spectral_type, scalar_type>;
+    using quotient_pdf_type = typename Config::quotient_pdf_type;
     using isocache_type = typename Config::isocache_type;
     using anisocache_type = typename Config::anisocache_type;
 

include/nbl/builtin/hlsl/bxdf/reflection/ggx.hlsl

@@ -127,7 +127,7 @@ struct SGGXIsotropicBxDF
     using anisotropic_interaction_type = typename Config::anisotropic_interaction_type;
     using sample_type = typename Config::sample_type;
     using spectral_type = typename Config::spectral_type;
-    using quotient_pdf_type = sampling::quotient_and_pdf<spectral_type, scalar_type>;
+    using quotient_pdf_type = typename Config::quotient_pdf_type;
     using isocache_type = typename Config::isocache_type;
     using anisocache_type = typename Config::anisocache_type;
 

include/nbl/builtin/hlsl/bxdf/reflection/lambertian.hlsl

@@ -92,7 +92,7 @@ struct SLambertianBxDF
     using anisotropic_interaction_type = typename Config::anisotropic_interaction_type;
     using sample_type = typename Config::sample_type;
     using spectral_type = typename Config::spectral_type;
-    using quotient_pdf_type = sampling::quotient_and_pdf<spectral_type, scalar_type>;
+    using quotient_pdf_type = typename Config::quotient_pdf_type;
 
     using params_isotropic_t = LambertianParams<sample_type, isotropic_interaction_type, scalar_type>;
     using params_anisotropic_t = LambertianParams<sample_type, anisotropic_interaction_type, scalar_type>;

include/nbl/builtin/hlsl/bxdf/reflection/oren_nayar.hlsl

@@ -95,7 +95,7 @@ struct SOrenNayarBxDF
     using anisotropic_interaction_type = typename Config::anisotropic_interaction_type;
     using sample_type = typename Config::sample_type;
     using spectral_type = typename Config::spectral_type;
-    using quotient_pdf_type = sampling::quotient_and_pdf<spectral_type, scalar_type>;
+    using quotient_pdf_type = typename Config::quotient_pdf_type;
 
     using params_isotropic_t = OrenNayarParams<sample_type, isotropic_interaction_type, scalar_type>;
     using params_anisotropic_t = OrenNayarParams<sample_type, anisotropic_interaction_type, scalar_type>;

include/nbl/builtin/hlsl/bxdf/transmission/beckmann.hlsl

@@ -148,7 +148,7 @@ struct SBeckmannDielectricIsotropicBxDF
     using anisotropic_interaction_type = typename Config::anisotropic_interaction_type;
     using sample_type = typename Config::sample_type;
     using spectral_type = typename Config::spectral_type;
-    using quotient_pdf_type = sampling::quotient_and_pdf<spectral_type, scalar_type>;
+    using quotient_pdf_type = typename Config::quotient_pdf_type;
     using isocache_type = typename Config::isocache_type;
     using anisocache_type = typename Config::anisocache_type;
     using brdf_type = reflection::SBeckmannIsotropicBxDF<Config>;

include/nbl/builtin/hlsl/bxdf/transmission/ggx.hlsl

@@ -132,7 +132,7 @@ struct SGGXDielectricIsotropicBxDF
     using anisotropic_interaction_type = typename Config::anisotropic_interaction_type;
     using sample_type = typename Config::sample_type;
     using spectral_type = typename Config::spectral_type;
-    using quotient_pdf_type = sampling::quotient_and_pdf<spectral_type, scalar_type>;
+    using quotient_pdf_type = typename Config::quotient_pdf_type;
     using isocache_type = typename Config::isocache_type;
     using anisocache_type = typename Config::anisocache_type;
     using brdf_type = reflection::SGGXIsotropicBxDF<Config>;
@@ -235,7 +235,7 @@ struct SGGXDielectricAnisotropicBxDF<Config NBL_PARTIAL_REQ_BOT(config_concepts:
     using anisotropic_interaction_type = typename Config::anisotropic_interaction_type;
     using sample_type = typename Config::sample_type;
     using spectral_type = typename Config::spectral_type;
-    using quotient_pdf_type = sampling::quotient_and_pdf<spectral_type, scalar_type>;
+    using quotient_pdf_type = typename Config::quotient_pdf_type;
     using isocache_type = typename Config::isocache_type;
     using anisocache_type = typename Config::anisocache_type;
     using brdf_type = reflection::SGGXAnisotropicBxDF<Config>;

include/nbl/builtin/hlsl/bxdf/transmission/lambertian.hlsl

@@ -93,7 +93,7 @@ struct SLambertianBxDF
     using anisotropic_interaction_type = typename Config::anisotropic_interaction_type;
     using sample_type = typename Config::sample_type;
     using spectral_type = typename Config::spectral_type;
-    using quotient_pdf_type = sampling::quotient_and_pdf<spectral_type, scalar_type>;
+    using quotient_pdf_type = typename Config::quotient_pdf_type;
 
     using params_isotropic_t = LambertianParams<sample_type, isotropic_interaction_type, scalar_type>;
     using params_anisotropic_t = LambertianParams<sample_type, anisotropic_interaction_type, scalar_type>;

include/nbl/builtin/hlsl/bxdf/transmission/smooth_dielectric.hlsl

@@ -94,7 +94,7 @@ struct SSmoothDielectricBxDF
     using anisotropic_interaction_type = typename Config::anisotropic_interaction_type;
     using sample_type = typename Config::sample_type;
     using spectral_type = typename Config::spectral_type;
-    using quotient_pdf_type = sampling::quotient_and_pdf<spectral_type, scalar_type>;
+    using quotient_pdf_type = typename Config::quotient_pdf_type;
 
     using params_isotropic_t = SmoothDielectricParams<sample_type, isotropic_interaction_type, scalar_type>;
     using params_anisotropic_t = SmoothDielectricParams<sample_type, anisotropic_interaction_type, scalar_type>;
@@ -201,7 +201,7 @@ struct SSmoothThinDielectricBxDF
     using anisotropic_interaction_type = typename Config::anisotropic_interaction_type;
     using sample_type = typename Config::sample_type;
     using spectral_type = typename Config::spectral_type;
-    using quotient_pdf_type = sampling::quotient_and_pdf<spectral_type, scalar_type>;
+    using quotient_pdf_type = typename Config::quotient_pdf_type;
 
     using params_isotropic_t = SmoothDielectricParams<sample_type, isotropic_interaction_type, scalar_type>;
     using params_anisotropic_t = SmoothDielectricParams<sample_type, anisotropic_interaction_type, scalar_type>;