Bxdf fixes cook torrance #930

devshgraphicsprogramming · 2025-09-16T14:03:10Z

Description

Continues #899 , #916 and #919

Testing

TODO list:

…eturn quants

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

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

include/nbl/builtin/hlsl/cpp_compat/vector.hlsl

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

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

devshgraphicsprogramming · 2025-10-07T09:48:24Z

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

+template<class N, class F, bool IsBSDF>
+struct quant_query_helper;
+
+template<class N, class F>
+struct quant_query_helper<N, F, true>
+{
+    using quant_query_type = typename N::quant_query_type;
+
+    template<class C>
+    static quant_query_type __call(NBL_REF_ARG(N) ndf, NBL_CONST_REF_ARG(F) fresnel, NBL_CONST_REF_ARG(C) cache)
+    {
+        return ndf.template createQuantQuery<C>(cache, fresnel.orientedEta.value[0]);
+    }
+};
+
+template<class N, class F>
+struct quant_query_helper<N, F, false>
+{
+    using quant_query_type = typename N::quant_query_type;
+
+    template<class C>
+    static quant_query_type __call(NBL_REF_ARG(N) ndf, NBL_CONST_REF_ARG(F) fresnel, NBL_CONST_REF_ARG(C) cache)
+    {
+        typename N::scalar_type dummy;
+        return ndf.template createQuantQuery<C>(cache, dummy);
+    }
+};
+
+template<class F, bool IsBSDF>
+struct check_TIR_helper;
+
+template<class F>
+struct check_TIR_helper<F, false>
+{
+    template<class MicrofacetCache>
+    static bool __call(NBL_CONST_REF_ARG(F) fresnel, NBL_CONST_REF_ARG(MicrofacetCache) cache)
+    {
+        return true;
+    }
+};
+
+template<class F>
+struct check_TIR_helper<F, true>
+{
+    template<class MicrofacetCache>
+    static bool __call(NBL_CONST_REF_ARG(F) fresnel, NBL_CONST_REF_ARG(MicrofacetCache) cache)
+    {
+        return cache.isValid(fresnel.getRefractionOrientedEta());
+    }
+};


I think its possible to move these into NBL_IUF_CONSTEXPR if you just made a struct which just concerns itself with

scalar_type orientedEta = impl::get_orientedEta_helper(fresnel); // return `fresnel.getRefractionOrientedEta()` if `SupportsTransmission` requiring a twosided fresnel, otherwise return uninitialized var

well your getOrientedFrensel already does what my suggested getOrientedEta_helper should do, (minus a call to getRefractionOrientedEta()

devshgraphicsprogramming · 2025-10-07T10:03:42Z

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

+        NBL_IF_CONSTEXPR(IsBSDF)
+        {
+            _f = impl::getOrientedFresnel<fresnel_type, IsBSDF>::__call(fresnel, interaction.getNdotV());
+            valid = impl::check_TIR_helper<fresnel_type, IsBSDF>::template __call<MicrofacetCache>(_f, cache);


you don't need check_TIR_helper, just call the cache.isValid() directly

Do a getter for orientedEta and reoriented fresnel, cause thats the thing that actually differs in codegen, not for calling cache.isValid()

devshgraphicsprogramming · 2025-10-07T10:04:54Z

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

+        scalar_type dummy;
+        quant_query_type qq = ndf.template createQuantQuery<MicrofacetCache>(cache, dummy);


whats the dummy in place of?

devshgraphicsprogramming · 2025-10-07T10:11:09Z

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

+            ray_dir_info_type invalidL;
+            invalidL.makeInvalid();
+            return sample_type::createFromTangentSpace(invalidL, interaction.getFromTangentSpace());


there's probably a faster way to make an invalid sample, require a createInvalid factory

devshgraphicsprogramming · 2025-10-07T10:17:57Z

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

+    template<typename C=bool_constant<!IsBSDF> >
+    enable_if_t<C::value && !IsBSDF, sample_type> generate(NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction, const vector2_type u, NBL_REF_ARG(anisocache_type) cache)
+    {
+        if (interaction.getNdotV() > numeric_limits<scalar_type>::min)


either rewrite the if so its > and put the valid case code inside, or assert that getNdotV is not NaN, as it stands a NaN will proceed

devshgraphicsprogramming · 2025-10-07T10:19:39Z

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

+            L.makeInvalid();    // should check if sample direction is invalid
+
+        const vector3_type T = interaction.getT();
+        const vector3_type B = interaction.getB();
+        const vector3_type _N = interaction.getN();
+
+        return sample_type::create(L, T, B, _N);


there should really be just a sample_type::createInvalid and this vode with TBN should go into the valid if-case

Also the NdotL computation should be overwritten by 2.f*cache.getVdotH()*localH.z - localV.z which you compute for the if-statement (the quantitiy you check to see if the sample has invalid path).

devshgraphicsprogramming · 2025-10-07T10:20:14Z

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

+        ray_dir_info_type L;
+        if (scalar_type(2.0) * VdotH * localH.z > localV.z) // NdotL>0, compiler's Common Subexpression Elimination pass should re-use 2*VdotH later
+        {
+            assert(VdotH >= scalar_type(0.0));


you can asset this as soon as VdotH is known with a comment about VNDF sampling

devshgraphicsprogramming · 2025-10-07T10:27:39Z

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

+        // fail if samples have invalid paths
+        const scalar_type NdotL = scalar_type(2.0) * VdotH * localH.z - localV.z;
+        if ((ComputeMicrofacetNormal<scalar_type>::isTransmissionPath(NdotV, NdotL) != transmitted))


hoist this check all the way to when VdotH and transmitted is first calculated

would be good to record all this in a comment #930 (comment)

devshgraphicsprogramming · 2025-10-07T10:32:57Z

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

+        const vector3_type upperHemisphereV = ieee754::flipSignIfRHSNegative<vector3_type>(localV, hlsl::promote<vector3_type>(NdotV));
+        const vector3_type localH = ndf.generateH(upperHemisphereV, u.xy);
+        const scalar_type VdotH = hlsl::dot(localV, localH);
+        const vector3_type H = hlsl::mul(interaction.getFromTangentSpace(), localH);


push calculation till last moment

devshgraphicsprogramming · 2025-10-07T10:33:34Z

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

+        const vector3_type B = interaction.getB();
+
+        // fail if samples have invalid paths
+        const scalar_type NdotL = scalar_type(2.0) * VdotH * localH.z - localV.z;


this is not a valid computation of NdotL for the BSDF, this is the reflection equation

if you follow

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

Lines 273 to 281 in 069f499

vector_type operator()(const bool doRefract, const scalar_type rcpOrientedEta, NBL_REF_ARG(scalar_type) out_IdotTorR) NBL_CONST_MEMBER_FUNC

{

scalar_type NdotI = getNdotR();

const scalar_type a = hlsl::mix<scalar_type>(1.0f, rcpOrientedEta, doRefract);

const scalar_type b = NdotI * a + getNdotTorR(doRefract, rcpOrientedEta);

// assuming `I` is normalized

out_IdotTorR = NdotI * b - a;

return refract.N * b - refract.I * a;

}

then using the NdotH==localH.z, NdotV and the LdotH you already compute for cache.isValid() you can compute NdotL as:

const float viewShortenFactor = hlsl::mix<scalar_type>(1.0f, rcpOrientedEta, transmitted); const float NdotL = localH.z * (VdotH*viewShortenFactor + LdotH) - NdotV * viewShortenFactor;

devshgraphicsprogramming · 2025-10-07T10:44:33Z

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

+        const vector3_type _N = interaction.getN();
+        Refract<scalar_type> r = Refract<scalar_type>::create(V.getDirection(), H);
+        const scalar_type LdotH = hlsl::mix(VdotH, r.getNdotT(rcpEta.value2[0]), transmitted);
+        cache = anisocache_type::createPartial(VdotH, LdotH, hlsl::dot(_N, H), transmitted, rcpEta);


you don't need to compute dot(_N,H) its literally localH.z

also assert that the cache.isValid() right away after this (it should be, by construction)

devshgraphicsprogramming · 2025-10-07T14:59:57Z

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

+                return rr(NdotTorR, rcpOrientedEta);
+            }
+            bxdf::ReflectRefract<scalar_type> rr;


leave a comment that the call rr makes to getNdotTorR and mix as well as a good part of the comuptations should CSE with our computation of NdotL (which should be hoisted above the reflect/refract code)

devshgraphicsprogramming · 2025-10-07T15:15:16Z

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

+    template<typename C=bool_constant<!IsAnisotropic> >
+    enable_if_t<C::value && !IsAnisotropic, scalar_type> pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction, NBL_CONST_REF_ARG(isocache_type) cache)
+    {
+        if (IsBSDF || (_sample.getNdotL() > numeric_limits<scalar_type>::min && interaction.getNdotV() > numeric_limits<scalar_type>::min))
+        {
+            scalar_type _pdf = __pdf<isotropic_interaction_type, isocache_type>(_sample, interaction, cache);
+            return hlsl::mix(scalar_type(0.0), _pdf, _pdf < bit_cast<scalar_type>(numeric_limits<scalar_type>::infinity));
+        }
+        else
+            return scalar_type(0.0);
+    }
+    scalar_type pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction, NBL_CONST_REF_ARG(anisocache_type) cache)


I think you can collapse the two methods if you use a REQUIRES(RequiredInteraction<Interaction> && RequiredCache<Cache>) similarly for other methods

devshgraphicsprogramming · 2025-10-07T15:15:59Z

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

+    template<typename C=bool_constant<!IsAnisotropic> >
+    enable_if_t<C::value && !IsAnisotropic, quotient_pdf_type> quotient_and_pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(isotropic_interaction_type) interaction, NBL_CONST_REF_ARG(isocache_type) cache)
+    {
+        return __quotient_and_pdf<isotropic_interaction_type, isocache_type>(_sample, interaction, cache);
+    }
+    quotient_pdf_type quotient_and_pdf(NBL_CONST_REF_ARG(sample_type) _sample, NBL_CONST_REF_ARG(anisotropic_interaction_type) interaction, NBL_CONST_REF_ARG(anisocache_type) cache)
+    {
+        return __quotient_and_pdf<anisotropic_interaction_type, anisocache_type>(_sample, interaction, cache);
+    }


you could get rid of simple passthrough if you put a REQUIRES on the __quotient_and_pdf and removed the __

devshgraphicsprogramming · 2025-10-07T15:19:20Z

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

+        quant_type D = ndf.template D<sample_type, Interaction, MicrofacetCache>(qq, _sample, interaction, cache);
+        scalar_type DG = D.projectedLightMeasure;
+        if (D.microfacetMeasure < bit_cast<scalar_type>(numeric_limits<scalar_type>::infinity))
+        {
+            using g2g1_query_type = typename ndf_type::g2g1_query_type;
+            g2g1_query_type gq = ndf.template createG2G1Query<sample_type, Interaction>(_sample, interaction);
+            DG *= ndf.template correlated<sample_type, Interaction>(gq, _sample, interaction);
+        }


hmm actually since Eval is not Quotient, it should return 0 whenever PDF would have been INF, and therefore whenever Eval is inf, you can just return 0

you could even add an NBL_REF_ARG(bool) to the D signature for a boolean side-channel of isInf because it pays for the NDF to set that boolean as soon as possible (before a chain or multiplies and divides, compiler won't hoiust your INF checks before divisions by measure factors, etc.)

devshgraphicsprogramming · 2025-10-07T15:39:59Z

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

+        quant_type D = ndf.template D<sample_type, Interaction, MicrofacetCache>(qq, _sample, interaction, cache);
+        scalar_type DG = D.projectedLightMeasure;
+        if (D.microfacetMeasure < bit_cast<scalar_type>(numeric_limits<scalar_type>::infinity))
+        {
+            using g2g1_query_type = typename ndf_type::g2g1_query_type;
+            g2g1_query_type gq = ndf.template createG2G1Query<sample_type, Interaction>(_sample, interaction);
+            DG *= ndf.template correlated<sample_type, Interaction>(gq, _sample, interaction);


we must let NDF provide a Dcorrelated method, and if detected, use that instead of this, because we miss an optimization opportunity with GGX

We could actually do this in the following way

using quant_query_type = typename ndf_type::quant_query_type; scalar_type dummy; quant_query_type qq = ndf.template createQuantQuery<MicrofacetCache>(cache, dummy); quant_type D = ndf.template D<sample_type, Interaction, MicrofacetCache>(qq, _sample, interaction, cache); scalar_type DG = D.projectedLightMeasure; if (D.microfacetMeasure < bit_cast<scalar_type>(numeric_limits<scalar_type>::infinity)) { using g2g1_query_type = typename ndf_type::g2g1_query_type; g2g1_query_type gq = ndf.template createG2G1Query<sample_type, Interaction>(_sample, interaction); DG *= ndf.template correlated<sample_type, Interaction>(gq, _sample, interaction); } // overwrites DG with NDF's `Dcorrelated` method, also `asserts` that the optimal method returns similar to above impl::overwrite_DG<ndf_type,sample_type,Interaction,Cache>(/*NBL_REF_ARG*/DG,ndf,...);

continues #930 (comment)

devshgraphicsprogramming · 2025-10-07T15:50:07Z

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

+    using scalar_type = T;
+
+    scalar_type getNdf() NBL_CONST_MEMBER_FUNC { return ndf; }
+    scalar_type getG1over2NdotV() NBL_CONST_MEMBER_FUNC { return G1_over_2NdotV; }


want to either comment or stick it in the name or the Query concept comment that its the wo_numerator

devshgraphicsprogramming · 2025-10-07T15:53:04Z

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

+    static scalar_type DG1(NBL_CONST_REF_ARG(Query) query)
    {
        return scalar_type(0.5) * query.getNdf() * query.getG1over2NdotV();


Query is not G1, this kinda seems to not make sense to me as a thing to return from DG1, I'm expecting NDF measure times the real G1 from a function called DG1

A rename might be in order, into DG1over4NdotV?

…ent_and_pdf

…back into OrientedEta struct

devshgraphicsprogramming · 2025-10-08T08:36:43Z

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

+        retval.iso_cache.VdotL = hlsl::mix(scalar_type(2.0) * retval.iso_cache.VdotH * retval.iso_cache.VdotH - scalar_type(1.0),
+                                VdotH * (LdotH - rcpOrientedEta.value[0] + VdotH * rcpOrientedEta.value[0]), transmitted);


there's a more graceful way to compute this via mix, see my other comment

devshgraphicsprogramming · 2025-10-08T08:39:13Z

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

    }

-    OrientedEtas<T> getRefractionOrientedEta() NBL_CONST_MEMBER_FUNC { return orientedEta; }
+    scalar_type getRefractionOrientedEta() NBL_CONST_MEMBER_FUNC { return orientedEta.value[0]; }   // expect T to be monochrome?


its a bit of a complicated topic, its possible to have RGB fresnel without dispersion by fixing the refraction Eta to be something else than the etas used to compute RGB reflectance or some sort of interpolation of them.

This is a good default cause the Etas wont differ that much anyway

devshgraphicsprogramming · 2025-10-08T08:42:54Z

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

+        fresnel::OrientedEtas<vector_type> orientedEta = fresnel::OrientedEtas<vector_type>::create(typename F::scalar_type(1.0), hlsl::promote<vector_type>(fresnel.getRefractionOrientedEta()));
+        return cache.isValid(orientedEta);


why are you promoting to a vector!? Cache.isValid MUST take the Eta as a scalar!!!!

devshgraphicsprogramming · 2025-10-08T08:48:21Z

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

+    template<class Interaction, class MicrofacetCache, typename C=bool_constant<!IsAnisotropic> NBL_FUNC_REQUIRES(RequiredInteraction<Interaction> && RequiredMicrofacetCache<MicrofacetCache>)
+    enable_if_t<C::value && !IsAnisotropic, dg1_query_type> createDG1Query(NBL_CONST_REF_ARG(Interaction) interaction, NBL_CONST_REF_ARG(MicrofacetCache) cache)
+    {
+        dg1_query_type dg1_query;
+        dg1_query.ndf = __ndf_base.template D<MicrofacetCache>(cache);
+        scalar_type clampedNdotV = interaction.getNdotV(_clamp);
+        dg1_query.G1_over_2NdotV = base_type::G1_wo_numerator_devsh_part(clampedNdotV, __ndf_base.devsh_part(interaction.getNdotV2()));
+        return dg1_query;
+    }
+    template<class LS, class Interaction, typename C=bool_constant<!IsAnisotropic> NBL_FUNC_REQUIRES(LightSample<LS> && RequiredInteraction<Interaction>)
+    enable_if_t<C::value && !IsAnisotropic, g2g1_query_type> createG2G1Query(NBL_CONST_REF_ARG(LS) _sample, NBL_CONST_REF_ARG(Interaction) interaction)
+    {
+        g2g1_query_type g2_query;
+        g2_query.devsh_l = __ndf_base.devsh_part(_sample.getNdotL2());
+        g2_query.devsh_v = __ndf_base.devsh_part(interaction.getNdotV2());
+        return g2_query;
+    }
+    template<class Interaction, class MicrofacetCache, typename C=bool_constant<IsAnisotropic> NBL_FUNC_REQUIRES(RequiredInteraction<Interaction> && RequiredMicrofacetCache<MicrofacetCache>)
+    enable_if_t<C::value && IsAnisotropic, dg1_query_type> createDG1Query(NBL_CONST_REF_ARG(Interaction) interaction, NBL_CONST_REF_ARG(MicrofacetCache) cache)
+    {
+        dg1_query_type dg1_query;
+        dg1_query.ndf = __ndf_base.template D<MicrofacetCache>(cache);
+        scalar_type clampedNdotV = interaction.getNdotV(_clamp);
+        dg1_query.G1_over_2NdotV = base_type::G1_wo_numerator_devsh_part(clampedNdotV, __ndf_base.devsh_part(interaction.getTdotV2(), interaction.getBdotV2(), interaction.getNdotV2()));
+        return dg1_query;
+    }


if you made createDG1Query use createG2G1Query and grab the devsh_v from the return value you could get away with only having one createDG1Query method I think

devshgraphicsprogramming · 2025-10-08T08:51:16Z

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

+    template<class LS, class Interaction NBL_FUNC_REQUIRES(LightSample<LS> && RequiredInteraction<Interaction>)
+    scalar_type correlated(NBL_CONST_REF_ARG(g2g1_query_type) query, NBL_CONST_REF_ARG(LS) _sample, NBL_CONST_REF_ARG(Interaction) interaction)
+    {
+        return base_type::template correlated_wo_numerator<g2g1_query_type, LS, Interaction>(query, _sample, interaction);
+    }
+
+    template<class LS, class Interaction, class MicrofacetCache NBL_FUNC_REQUIRES(LightSample<LS> && RequiredInteraction<Interaction> && RequiredMicrofacetCache<MicrofacetCache>)
+    scalar_type G2_over_G1(NBL_CONST_REF_ARG(g2g1_query_type) query, NBL_CONST_REF_ARG(LS) _sample, NBL_CONST_REF_ARG(Interaction) interaction, NBL_CONST_REF_ARG(MicrofacetCache) cache)
+    {
+        return base_type::template G2_over_G1<g2g1_query_type, LS, Interaction, MicrofacetCache>(query, _sample, interaction, cache);
+    }


as pointed out, they're just passthroughs, could implement the methords here cause they're identical between isotropic and anisotropic when done in terms of queries

devshgraphicsprogramming · 2025-10-08T08:52:21Z

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

+        dmq.microfacetMeasure = d;
+        dmq.projectedLightMeasure = d * _sample.getNdotL(BxDFClampMode::BCM_MAX);


this is wrong, the projectedLightMeasure needs a full transform same as beckmann

because its the PDF of V getting reflected through H which has a PDF of microfacetmeasure

devshgraphicsprogramming · 2025-10-08T09:09:16Z

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

+    {
+        scalar_type d = __ndf_base.template D<MicrofacetCache>(cache);
+        quant_type dmq;
+        dmq.microfacetMeasure = d;  // note: microfacetMeasure/2NdotV


huh? then the method shouldn't be called D but D_over_2NdotV

but the comment is wrong, cause your __ndf_base.D is actually the NDF, not anythingelse

devshgraphicsprogramming · 2025-10-08T09:11:24Z

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

+        scalar_type NdotL_over_denominator = _sample.getNdotL(BxDFClampMode::BCM_ABS);
+        if (transmitted)
+                NdotL_over_denominator *= -scalar_type(4.0) * VdotHLdotH / (VdotH_etaLdotH * VdotH_etaLdotH);
+        dmq.projectedLightMeasure = d * NdotL_over_denominator;


wrong the denominator is 4 NdotV NdotL, so NdotL over denominator must be 0.25 / NdotV(ABS)

keptsecret added 23 commits September 4, 2025 10:46

changes to dual measure quant, old stuff commented out for now

5218545

create query structs in beckmann ndf, removed query concepts, funcs r…

f7525af

…eturn quants

did the same for ggx ndf, some fixes to beckmann

c50db68

Merge branch 'master' into bxdf_fixes_cook_torrance

c49bedb

fixes to ndf concept

319c954

moved eval, quotient/pdf into cook torrance base

4eeacf1

moved generate H into ndfs, generate impl in cook torrance base

e7bc784

use new cook torrance base in microfacet bxdfs

72226bb

Merge branch 'master' into bxdf_fixes_cook_torrance

f34b348

numerous typo bug fixes

ad13044

fixes to ggx ndf

d8d2116

fixed conductor fresnel naming ior as eta

238b08e

minor fixes to beckmann ndf, removed obsolete comments

8bc707f

added luminosity contribution hint to cook torrance bsdfs

9fb28cf

added aniso overloads to isotropic bxdf methods

4cb8a0a

checks for invalid generate sample

392dc31

removed obsolete commented out stuff

02de86e

added cartesian-polar conversions from unit tests

4a7f532

Merge branch 'fix_rotation_mat' into bxdf_fixes_cook_torrance

80c4f67

Merge branch 'master' into bxdf_fixes_cook_torrance

6233bd1

vector hashes

ce5fbac

Merge branch 'fix_rotation_mat' into bxdf_fixes_cook_torrance

47e814b

Merge branch 'master' into bxdf_fixes_cook_torrance

c983975

devshgraphicsprogramming commented Sep 16, 2025

View reviewed changes

include/nbl/builtin/hlsl/bxdf/common.hlsl Outdated Show resolved Hide resolved

devshgraphicsprogramming commented Sep 16, 2025

View reviewed changes

include/nbl/builtin/hlsl/math/functions.hlsl Outdated Show resolved Hide resolved

devshgraphicsprogramming commented Sep 16, 2025

View reviewed changes

include/nbl/builtin/hlsl/cpp_compat/vector.hlsl Outdated Show resolved Hide resolved

keptsecret added 2 commits September 17, 2025 15:26

fix fresnel usage in bxdf pdf

0f2ee0b

fix F calc in generate

b5f02e6

devshgraphicsprogramming commented Sep 17, 2025

View reviewed changes

include/nbl/builtin/hlsl/bxdf/fresnel.hlsl Outdated Show resolved Hide resolved

devshgraphicsprogramming commented Sep 17, 2025

View reviewed changes

include/nbl/builtin/hlsl/bxdf/cook_torrance_base.hlsl Outdated Show resolved Hide resolved

devshgraphicsprogramming commented Oct 7, 2025

View reviewed changes

keptsecret added 2 commits October 8, 2025 14:06

moved cook torrance checks into private func, changed checks in quoti…

22c4918

…ent_and_pdf

getRefractionOrientedEta returns a scalar, but now I have to turn it …

dcc2464

…back into OrientedEta struct

devshgraphicsprogramming commented Oct 8, 2025

View reviewed changes

keptsecret added 2 commits October 8, 2025 16:32

moved ndf type defs and constexpr declaration into macro

7aa071b

moved out quant query, adjusted ndf macro usage

97e5ce3

		scalar_type dummy;
		quant_query_type qq = ndf.template createQuantQuery<MicrofacetCache>(cache, dummy);

	vector_type operator()(const bool doRefract, const scalar_type rcpOrientedEta, NBL_REF_ARG(scalar_type) out_IdotTorR) NBL_CONST_MEMBER_FUNC
	{
	scalar_type NdotI = getNdotR();
	const scalar_type a = hlsl::mix<scalar_type>(1.0f, rcpOrientedEta, doRefract);
	const scalar_type b = NdotI * a + getNdotTorR(doRefract, rcpOrientedEta);
	// assuming `I` is normalized
	out_IdotTorR = NdotI * b - a;
	return refract.N * b - refract.I * a;
	}

		retval.iso_cache.VdotL = hlsl::mix(scalar_type(2.0) * retval.iso_cache.VdotH * retval.iso_cache.VdotH - scalar_type(1.0),
		VdotH * (LdotH - rcpOrientedEta.value[0] + VdotH * rcpOrientedEta.value[0]), transmitted);

		fresnel::OrientedEtas<vector_type> orientedEta = fresnel::OrientedEtas<vector_type>::create(typename F::scalar_type(1.0), hlsl::promote<vector_type>(fresnel.getRefractionOrientedEta()));
		return cache.isValid(orientedEta);

		dmq.microfacetMeasure = d;
		dmq.projectedLightMeasure = d * _sample.getNdotL(BxDFClampMode::BCM_MAX);

Bxdf fixes cook torrance #930

Are you sure you want to change the base?

Bxdf fixes cook torrance #930

Conversation

devshgraphicsprogramming commented Sep 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Testing

TODO list:

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

devshgraphicsprogramming Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

devshgraphicsprogramming Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

devshgraphicsprogramming Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

devshgraphicsprogramming Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

devshgraphicsprogramming Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

devshgraphicsprogramming Oct 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

devshgraphicsprogramming commented Sep 16, 2025 •

edited

Loading

devshgraphicsprogramming Oct 7, 2025 •

edited

Loading

devshgraphicsprogramming Oct 7, 2025 •

edited

Loading

devshgraphicsprogramming Oct 7, 2025 •

edited

Loading

devshgraphicsprogramming Oct 7, 2025 •

edited

Loading

devshgraphicsprogramming Oct 7, 2025 •

edited

Loading

devshgraphicsprogramming Oct 8, 2025 •

edited

Loading