added IsMicrofacet to bxdf_traits

keptsecret · keptsecret · commit 804014f28e74 · 2025-10-03T16:56:24.000+07:00
diff --git a/include/nbl/builtin/hlsl/bxdf/reflection/beckmann.hlsl b/include/nbl/builtin/hlsl/bxdf/reflection/beckmann.hlsl
@@ -31,6 +31,7 @@ template<typename C>
 struct traits<bxdf::reflection::SBeckmannIsotropic<C> >
 {
     NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BRDF;
+    NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;
 };
@@ -39,6 +40,7 @@ template<typename C>
 struct traits<bxdf::reflection::SBeckmannAnisotropic<C> >
 {
     NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BRDF;
+    NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;
 };
diff --git a/include/nbl/builtin/hlsl/bxdf/reflection/delta_distribution.hlsl b/include/nbl/builtin/hlsl/bxdf/reflection/delta_distribution.hlsl
@@ -74,6 +74,7 @@ template<typename C>
 struct traits<bxdf::reflection::SDeltaDistribution<C> >
 {
     NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BRDF;
+    NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = false;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = false;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;
 };
diff --git a/include/nbl/builtin/hlsl/bxdf/reflection/ggx.hlsl b/include/nbl/builtin/hlsl/bxdf/reflection/ggx.hlsl
@@ -31,6 +31,7 @@ template<typename C>
 struct traits<bxdf::reflection::SGGXIsotropic<C> >
 {
     NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BRDF;
+    NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;
 };
@@ -39,6 +40,7 @@ template<typename C>
 struct traits<bxdf::reflection::SGGXAnisotropic<C> >
 {
     NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BRDF;
+    NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;
 };
diff --git a/include/nbl/builtin/hlsl/bxdf/reflection/lambertian.hlsl b/include/nbl/builtin/hlsl/bxdf/reflection/lambertian.hlsl
@@ -25,6 +25,7 @@ template<typename C>
 struct traits<bxdf::reflection::SLambertian<C> >
 {
     NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BRDF;
+    NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = false;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = false;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;
 };
diff --git a/include/nbl/builtin/hlsl/bxdf/reflection/oren_nayar.hlsl b/include/nbl/builtin/hlsl/bxdf/reflection/oren_nayar.hlsl
@@ -25,6 +25,7 @@ template<typename C>
 struct traits<bxdf::reflection::SOrenNayar<C> >
 {
     NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BRDF;
+    NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = false;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;
 };
diff --git a/include/nbl/builtin/hlsl/bxdf/transmission/beckmann.hlsl b/include/nbl/builtin/hlsl/bxdf/transmission/beckmann.hlsl
@@ -31,6 +31,7 @@ template<typename C>
 struct traits<bxdf::transmission::SBeckmannDielectricIsotropic<C> >
 {
     NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BSDF;
+    NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;
 };
@@ -39,6 +40,7 @@ template<typename C>
 struct traits<bxdf::transmission::SBeckmannDielectricAnisotropic<C> >
 {
     NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BSDF;
+    NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;
 };
diff --git a/include/nbl/builtin/hlsl/bxdf/transmission/delta_distribution.hlsl b/include/nbl/builtin/hlsl/bxdf/transmission/delta_distribution.hlsl
@@ -71,6 +71,7 @@ template<typename C>
 struct traits<bxdf::transmission::SDeltaDistribution<C> >
 {
     NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BSDF;
+    NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = false;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = false;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;
 };
diff --git a/include/nbl/builtin/hlsl/bxdf/transmission/ggx.hlsl b/include/nbl/builtin/hlsl/bxdf/transmission/ggx.hlsl
@@ -31,6 +31,7 @@ template<typename C>
 struct traits<bxdf::transmission::SGGXDielectricIsotropic<C> >
 {
     NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BSDF;
+    NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;
 };
@@ -39,6 +40,7 @@ template<typename C>
 struct traits<bxdf::transmission::SGGXDielectricAnisotropic<C> >
 {
     NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BSDF;
+    NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;
 };
diff --git a/include/nbl/builtin/hlsl/bxdf/transmission/lambertian.hlsl b/include/nbl/builtin/hlsl/bxdf/transmission/lambertian.hlsl
@@ -25,6 +25,7 @@ template<typename C>
 struct traits<bxdf::transmission::SLambertian<C> >
 {
     NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BSDF;
+    NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = false;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = false;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;
 };
diff --git a/include/nbl/builtin/hlsl/bxdf/transmission/oren_nayar.hlsl b/include/nbl/builtin/hlsl/bxdf/transmission/oren_nayar.hlsl
@@ -24,7 +24,8 @@ using SOrenNayar = base::SOrenNayarBase<Config, true>;
 template<typename C>
 struct traits<bxdf::transmission::SOrenNayar<C> >
 {
-    NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BRDF;
+    NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BSDF;
+    NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = false;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;
 };
diff --git a/include/nbl/builtin/hlsl/bxdf/transmission/smooth_dielectric.hlsl b/include/nbl/builtin/hlsl/bxdf/transmission/smooth_dielectric.hlsl
@@ -173,6 +173,7 @@ template<typename C>
 struct traits<bxdf::transmission::SSmoothDielectric<C> >
 {
     NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BSDF;
+    NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = false;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;
 };
@@ -181,6 +182,7 @@ template<typename C>
 struct traits<bxdf::transmission::SThinSmoothDielectric<C> >
 {
     NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BSDF;
+    NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = false;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = true;
     NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;
 };

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ template<typename C>`
`74`	`74`	`struct traits<bxdf::reflection::SDeltaDistribution<C> >`
`75`	`75`	`{`
`76`	`76`	`NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BRDF;`
	`77`	`+ NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = false;`
`77`	`78`	`NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = false;`
`78`	`79`	`NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;`
`79`	`80`	`};`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ template<typename C>`
`25`	`25`	`struct traits<bxdf::reflection::SLambertian<C> >`
`26`	`26`	`{`
`27`	`27`	`NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BRDF;`
	`28`	`+ NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = false;`
`28`	`29`	`NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = false;`
`29`	`30`	`NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;`
`30`	`31`	`};`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ template<typename C>`
`71`	`71`	`struct traits<bxdf::transmission::SDeltaDistribution<C> >`
`72`	`72`	`{`
`73`	`73`	`NBL_CONSTEXPR_STATIC_INLINE BxDFType type = BT_BSDF;`
	`74`	`+ NBL_CONSTEXPR_STATIC_INLINE bool IsMicrofacet = false;`
`74`	`75`	`NBL_CONSTEXPR_STATIC_INLINE bool clampNdotV = false;`
`75`	`76`	`NBL_CONSTEXPR_STATIC_INLINE bool clampNdotL = true;`
`76`	`77`	`};`