Bxdf fixes cook torrance

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

@@ -11,6 +11,7 @@
 #include "nbl/builtin/hlsl/ieee754.hlsl"
 #include "nbl/builtin/hlsl/tgmath.hlsl"
 #include "nbl/builtin/hlsl/math/functions.hlsl"
+// #include "nbl/builtin/hlsl/glsl_compat/core.hlsl"
 #include "nbl/builtin/hlsl/cpp_compat/promote.hlsl"
 #include "nbl/builtin/hlsl/bxdf/fresnel.hlsl"
 #include "nbl/builtin/hlsl/sampling/quotient_and_pdf.hlsl"
@@ -429,6 +430,8 @@ struct SLightSample
     }
     scalar_type getNdotL2() NBL_CONST_MEMBER_FUNC { return NdotL2; }
 
+    bool isValid() NBL_CONST_MEMBER_FUNC { return !hlsl::all<vector<bool, 3> >(hlsl::glsl::equal(L.getDirection(), hlsl::promote<vector3_type>(0.0))); }
+
 
     RayDirInfo L;
 
@@ -737,7 +740,7 @@ struct SAnisotropicMicrofacetCache
     {
         this_t retval;
         retval.iso_cache = isocache_type::create(V,L,N,orientedEtas,H);
-        const bool valid = retval.iso_cache.NdotH >= 0.0;
+        const bool valid = retval.iso_cache.getNdotH() >= 0.0;
         if (valid)
         {
             retval.TdotH = nbl::hlsl::dot<vector3_type>(T,H);
@@ -755,7 +758,7 @@ struct SAnisotropicMicrofacetCache
         this_t retval;
         vector3_type H;
         retval.iso_cache = isocache_type::template create<typename AnisotropicInteraction::isotropic_interaction_type, LS>(interaction.isotropic,_sample,orientedEtas,H);
-        const bool valid = retval.iso_cache.NdotH >= 0.0;
+        const bool valid = retval.iso_cache.getNdotH() >= 0.0;
         if (valid)
         {
             retval.TdotH = nbl::hlsl::dot<vector3_type>(interaction.getT(),H);

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

@@ -347,21 +347,21 @@ struct Conductor
     using scalar_type = typename vector_traits<T>::scalar_type;
     using vector_type = T;
 
-    static Conductor<T> create(NBL_CONST_REF_ARG(T) eta, NBL_CONST_REF_ARG(T) etak)
+    static Conductor<T> create(NBL_CONST_REF_ARG(T) ior, NBL_CONST_REF_ARG(T) iork)
     {
         Conductor<T> retval;
-        retval.eta = eta;
-        retval.etak = etak;
-        retval.etak2 = etak*etak;
+        retval.ior = ior;
+        retval.iork = iork;
+        retval.iork2 = iork*iork;
         return retval;
     }
 
-    static Conductor<T> create(NBL_CONST_REF_ARG(complex_t<T>) eta)
+    static Conductor<T> create(NBL_CONST_REF_ARG(complex_t<T>) ior)
     {
         Conductor<T> retval;
-        retval.eta = eta.real();
-        retval.etak = eta.imag();
-        retval.etak2 = eta.imag()*eta.imag();
+        retval.ior = ior.real();
+        retval.iork = ior.imag();
+        retval.iork2 = ior.imag()*ior.imag();
         return retval;
     }
 
@@ -370,9 +370,9 @@ struct Conductor
         const scalar_type cosTheta2 = clampedCosTheta * clampedCosTheta;
         //const float sinTheta2 = 1.0 - cosTheta2;
 
-        const T etaLen2 = eta * eta + etak2;
+        const T etaLen2 = ior * ior + iork2;
         assert(hlsl::all(etaLen2 > hlsl::promote<T>(hlsl::exp2<scalar_type>(-numeric_limits<scalar_type>::digits))));
-        const T etaCosTwice = eta * clampedCosTheta * 2.0f;
+        const T etaCosTwice = ior * clampedCosTheta * 2.0f;
 
         const T rs_common = etaLen2 + (T)(cosTheta2);
         const T rs2 = (rs_common - etaCosTwice) / (rs_common + etaCosTwice);
@@ -383,9 +383,9 @@ struct Conductor
         return (rs2 + rp2) * 0.5f;
     }
 
-    T eta;
-    T etak;
-    T etak2;
+    T ior;
+    T iork;
+    T iork2;
 };
 
 template<typename T NBL_PRIMARY_REQUIRES(concepts::FloatingPointLikeVectorial<T>)

include/nbl/builtin/hlsl/bxdf/ndf.hlsl

@@ -21,48 +21,40 @@ namespace dummy_impl
 using sample_t = SLightSample<ray_dir_info::SBasic<float> >;
 using interaction_t = surface_interactions::SAnisotropic<surface_interactions::SIsotropic<ray_dir_info::SBasic<float> > >;
 using cache_t = SAnisotropicMicrofacetCache<SIsotropicMicrofacetCache<float> >;
-struct MetaQuery   // nonsense struct, just put in all the functions to pass the ndf query concepts
-{
-    using scalar_type = float;
-
-    scalar_type getNdf() NBL_CONST_MEMBER_FUNC { return 0; }
-    scalar_type getLambdaL() NBL_CONST_MEMBER_FUNC { return 0; }
-    scalar_type getLambdaV() NBL_CONST_MEMBER_FUNC { return 0; }
-
-    scalar_type getG1over2NdotV() NBL_CONST_MEMBER_FUNC { return 0; }
-    scalar_type getOrientedEta() NBL_CONST_MEMBER_FUNC { return 0; }
-    scalar_type getDevshV() NBL_CONST_MEMBER_FUNC { return 0; }
-    scalar_type getDevshL() NBL_CONST_MEMBER_FUNC { return 0; }
-    BxDFClampMode getClampMode() NBL_CONST_MEMBER_FUNC { return BxDFClampMode::BCM_NONE; }
-};
 }
 
 #define NBL_CONCEPT_NAME NDF
 #define NBL_CONCEPT_TPLT_PRM_KINDS (typename)
 #define NBL_CONCEPT_TPLT_PRM_NAMES (T)
 #define NBL_CONCEPT_PARAM_0 (ndf, T)
-#define NBL_CONCEPT_PARAM_1 (query, dummy_impl::MetaQuery)
+#define NBL_CONCEPT_PARAM_1 (quant_query, typename T::quant_query_type)
 #define NBL_CONCEPT_PARAM_2 (_sample, dummy_impl::sample_t)
 #define NBL_CONCEPT_PARAM_3 (interaction, dummy_impl::interaction_t)
 #define NBL_CONCEPT_PARAM_4 (cache, dummy_impl::cache_t)
-NBL_CONCEPT_BEGIN(5)
+#define NBL_CONCEPT_PARAM_5 (dg1_query, typename T::dg1_query_type)
+#define NBL_CONCEPT_PARAM_6 (g2_query, typename T::g2g1_query_type)
+NBL_CONCEPT_BEGIN(7)
 #define ndf NBL_CONCEPT_PARAM_T NBL_CONCEPT_PARAM_0
-#define query NBL_CONCEPT_PARAM_T NBL_CONCEPT_PARAM_1
+#define quant_query NBL_CONCEPT_PARAM_T NBL_CONCEPT_PARAM_1
 #define _sample NBL_CONCEPT_PARAM_T NBL_CONCEPT_PARAM_2
 #define interaction NBL_CONCEPT_PARAM_T NBL_CONCEPT_PARAM_3
 #define cache NBL_CONCEPT_PARAM_T NBL_CONCEPT_PARAM_4
+#define dg1_query NBL_CONCEPT_PARAM_T NBL_CONCEPT_PARAM_5
+#define g2_query NBL_CONCEPT_PARAM_T NBL_CONCEPT_PARAM_6
 NBL_CONCEPT_END(
     ((NBL_CONCEPT_REQ_TYPE)(T::scalar_type))
-    ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((ndf.template D<dummy_impl::cache_t>(cache)), ::nbl::hlsl::is_same_v, typename T::scalar_type))
-    ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((ndf.template DG1<dummy_impl::MetaQuery>(query)), ::nbl::hlsl::is_same_v, typename T::scalar_type))
-    ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((ndf.template DG1<dummy_impl::MetaQuery, dummy_impl::cache_t>(query, cache)), ::nbl::hlsl::is_same_v, typename T::scalar_type))
-    ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((ndf.template correlated<dummy_impl::MetaQuery, dummy_impl::sample_t, dummy_impl::interaction_t>(query, _sample, interaction)), ::nbl::hlsl::is_same_v, typename T::scalar_type))
-    ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((ndf.template G2_over_G1<dummy_impl::MetaQuery, dummy_impl::sample_t, dummy_impl::interaction_t, dummy_impl::cache_t>(query, _sample, interaction, cache)), ::nbl::hlsl::is_same_v, typename T::scalar_type))
+    ((NBL_CONCEPT_REQ_TYPE)(T::quant_type))
+    ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((ndf.template D<dummy_impl::sample_t, dummy_impl::interaction_t, dummy_impl::cache_t>(quant_query, _sample, interaction, cache)), ::nbl::hlsl::is_same_v, typename T::quant_type))
+    ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((ndf.template DG1<dummy_impl::sample_t, dummy_impl::interaction_t>(dg1_query, quant_query, _sample, interaction)), ::nbl::hlsl::is_same_v, typename T::quant_type))
+    ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((ndf.template correlated<dummy_impl::sample_t, dummy_impl::interaction_t>(g2_query, quant_query, _sample, interaction)), ::nbl::hlsl::is_same_v, typename T::quant_type))
+    ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((ndf.template G2_over_G1<dummy_impl::sample_t, dummy_impl::interaction_t, dummy_impl::cache_t>(g2_query, _sample, interaction, cache)), ::nbl::hlsl::is_same_v, typename T::scalar_type))
 );
+#undef g2_query
+#undef dg1_query
 #undef cache
 #undef interaction
 #undef _sample
-#undef query
+#undef quant_query
 #undef ndf
 #include <nbl/builtin/hlsl/concepts/__end.hlsl>